Merge branch 'refs/heads/ninja-internal' into EricMerge

Conflicts:
	js/tools/Rotate3DToolBase.js
	js/tools/RotateStage3DTool.js
	js/tools/Translate3DToolBase.js
	js/tools/modifier-tool-base.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index 251e86e4..d3673105 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -62,6 +62,13 @@
                 }
             },
 
+            "panel_6": {
+                "prototype": "js/panels/Panel.reel",
+                "properties": {
+                    "element": {"#": "panel_6"}
+                }
+            },
+
             "owner": {
                 "module": "js/panels/PanelContainer.reel",
                 "name": "PanelContainer",
@@ -74,7 +81,8 @@
                     "panel_2":          {"@": "panel_2"},
                     "panel_3":          {"@": "panel_3"},
                     "panel_4":          {"@": "panel_4"},
-                    "panel_5":          {"@": "panel_5"}
+                    "panel_5":          {"@": "panel_5"},
+                    "panel_6":          {"@": "panel_6"}
                 },
                 "listeners": [
                     {
@@ -104,6 +112,7 @@
             <article data-montage-id="panel_3"></article>
             <article data-montage-id="panel_4"></article>
             <article data-montage-id="panel_5"></article>
+            <article data-montage-id="panel_6"></article>
                 </article>
     </section>
 </body>