Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	_scss/compass_app_log.txt
	_scss/imports/scss/_Stage.scss

56 files changed, 34 insertions, 107 deletions

diff --git a/.gitignore b/.gitignore
index b92bd629..fd016bd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
 
 cloud/
 
-/.idea/scopes/scope_settings.xml
\ No newline at end of file
+/.idea/scopes/scope_settings.xml
+_scss/imports/scss/_Stage.scss
+compass_app_log.txt
\ No newline at end of file
diff --git a/_scss/imports/scss/_Stage.scss b/_scss/imports/scss/_Stage.scss
deleted file mode 100755
index bed29d98..00000000
--- a/_scss/imports/scss/_Stage.scss
+++ /dev/null
@@ -1,103 +0,0 @@
-// <copyright>
-// This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-// (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-// </copyright>
-
-#middleDocArea {
-    -webkit-box-orient: horizontal;
-    -moz-box-orient: horizontal;
-    box-orient: horizontal;
-
-    -moz-box-flex: 1;
-    -webkit-box-flex: 1;
-    box-flex: 1;
-
-    margin: 1px;
-    margin-bottom:3px;
-
-    border-style: solid;
-    border-width: 1px;
-}
-
-#stageBG {
-    width:100%;
-    height:100%;
-    background-color: red;
-    position: absolute;
-    margin-left: auto;
-    margin-right: auto;
-    left: 0;
-    right: 0;
-    top: 150px;
-
-    z-index: 0;
-}
-
-#stageUserContent {
-    width:100%;
-    height:100%;
-    background-color: transparent;
-    border : 1px solid $color-body-border;
-
-    position: absolute;
-    margin-left: auto;
-    margin-right: auto;
-    left: 0;
-    right: 0;
-    top: 150px;
-
-    z-index: 1;
-}
-
-.global3DSettings {
-    -webkit-transform-style: preserve-3d;
-    -webkit-transform:perspective(1400) matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1);
-}
-
-.perspective3D {
-    -webkit-perspective: 1400;
-}
-
-#iframeContainer {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    margin: 0px;
-    padding: 0px;
-    width:100%;
-    height:100%;
-    overflow:scroll;
-    background:$color-stage;
-}
-
-#drawingCanvas {
-    position: absolute;
-    margin: 0px;
-    border: none;
-    padding: 0px;
-    top: 0px;
-    left: 0px;
-    z-index: 6;
-}
-
-
-#stageCanvas {
-    position: absolute;
-    margin: 0px;
-    border: none;
-    padding: 0px;
-    top: 0px;
-    left: 0px;
-    z-index: 5;
-}
-
-#layoutCanvas {
-    position: absolute;
-    margin: 0px;
-    border: none;
-    padding: 0px;
-    top: 0px;
-    left: 0px;
-    z-index: 4;
-}
diff --git a/assets/images/BasePlatformA01_AO.png b/assets/images/BasePlatformA01_AO.png
deleted file mode 100755
index 11f74245..00000000
--- a/assets/images/BasePlatformA01_AO.png
+++ /dev/null
diff --git a/assets/images/BasePlatformA01_DM.png b/assets/images/BasePlatformA01_DM.png
deleted file mode 100755
index f367ccb7..00000000
--- a/assets/images/BasePlatformA01_DM.png
+++ /dev/null
diff --git a/assets/images/BoxA01_AO.png b/assets/images/BoxA01_AO.png
deleted file mode 100755
index 60a88883..00000000
--- a/assets/images/BoxA01_AO.png
+++ /dev/null
diff --git a/assets/images/BoxA01_DM.png b/assets/images/BoxA01_DM.png
deleted file mode 100755
index cc6f6165..00000000
--- a/assets/images/BoxA01_DM.png
+++ /dev/null
diff --git a/assets/images/Grunge.png b/assets/images/Grunge.png
deleted file mode 100755
index 49ff48e9..00000000
--- a/assets/images/Grunge.png
+++ /dev/null
diff --git a/assets/images/LabelFrame.tga b/assets/images/LabelFrame.tga
deleted file mode 100755
index 7e3326bd..00000000
--- a/assets/images/LabelFrame.tga
+++ /dev/null
diff --git a/assets/images/MArmBaseN_DM.png b/assets/images/MArmBaseN_DM.png
deleted file mode 100755
index 6845b555..00000000
--- a/assets/images/MArmBaseN_DM.png
+++ /dev/null
diff --git a/assets/images/MArmBaseN_NM.png b/assets/images/MArmBaseN_NM.png
deleted file mode 100755
index 5009b0ec..00000000
--- a/assets/images/MArmBaseN_NM.png
+++ /dev/null
diff --git a/assets/images/MArmTopN_DM.png b/assets/images/MArmTopN_DM.png
deleted file mode 100755
index ef3511b3..00000000
--- a/assets/images/MArmTopN_DM.png
+++ /dev/null
diff --git a/assets/images/MArmTopN_NM.png b/assets/images/MArmTopN_NM.png
deleted file mode 100755
index 489c92db..00000000
--- a/assets/images/MArmTopN_NM.png
+++ /dev/null
diff --git a/assets/images/MArm_AO.png b/assets/images/MArm_AO.png
deleted file mode 100755
index be27c8cb..00000000
--- a/assets/images/MArm_AO.png
+++ /dev/null
diff --git a/assets/images/MBaseWallA01_AO.png b/assets/images/MBaseWallA01_AO.png
deleted file mode 100755
index d68e4209..00000000
--- a/assets/images/MBaseWallA01_AO.png
+++ /dev/null
diff --git a/assets/images/MBaseWallA01_DM.png b/assets/images/MBaseWallA01_DM.png
deleted file mode 100755
index 02a31e16..00000000
--- a/assets/images/MBaseWallA01_DM.png
+++ /dev/null
diff --git a/assets/images/MBaseWallA01_GM.png b/assets/images/MBaseWallA01_GM.png
deleted file mode 100755
index 726453ae..00000000
--- a/assets/images/MBaseWallA01_GM.png
+++ /dev/null
diff --git a/assets/images/MBase_AO.png b/assets/images/MBase_AO.png
deleted file mode 100755
index 12d763da..00000000
--- a/assets/images/MBase_AO.png
+++ /dev/null
diff --git a/assets/images/MCoreBase_DM.png b/assets/images/MCoreBase_DM.png
deleted file mode 100755
index 4d0ec6dd..00000000
--- a/assets/images/MCoreBase_DM.png
+++ /dev/null
diff --git a/assets/images/MCoreBase_GM.png b/assets/images/MCoreBase_GM.png
deleted file mode 100755
index 81d464ec..00000000
--- a/assets/images/MCoreBase_GM.png
+++ /dev/null
diff --git a/assets/images/MEjectorBaseN_DM.png b/assets/images/MEjectorBaseN_DM.png
deleted file mode 100755
index 1832c522..00000000
--- a/assets/images/MEjectorBaseN_DM.png
+++ /dev/null
diff --git a/assets/images/MEjectorBaseN_NM.png b/assets/images/MEjectorBaseN_NM.png
deleted file mode 100755
index 4f7560d3..00000000
--- a/assets/images/MEjectorBaseN_NM.png
+++ /dev/null
diff --git a/assets/images/MRingBaseN_DM.png b/assets/images/MRingBaseN_DM.png
deleted file mode 100755
index f8a4aebe..00000000
--- a/assets/images/MRingBaseN_DM.png
+++ /dev/null
diff --git a/assets/images/MRingBaseN_NM.png b/assets/images/MRingBaseN_NM.png
deleted file mode 100755
index c9242acb..00000000
--- a/assets/images/MRingBaseN_NM.png
+++ /dev/null
diff --git a/assets/images/MSquareBaseN_DM.png b/assets/images/MSquareBaseN_DM.png
deleted file mode 100755
index 5576eff0..00000000
--- a/assets/images/MSquareBaseN_DM.png
+++ /dev/null
diff --git a/assets/images/MWall_AO.png b/assets/images/MWall_AO.png
deleted file mode 100755
index e5d5a684..00000000
--- a/assets/images/MWall_AO.png
+++ /dev/null
diff --git a/assets/images/MWall_DM.png b/assets/images/MWall_DM.png
deleted file mode 100755
index b735de01..00000000
--- a/assets/images/MWall_DM.png
+++ /dev/null
diff --git a/assets/images/MWall_GM.png b/assets/images/MWall_GM.png
deleted file mode 100755
index 2cd56c3d..00000000
--- a/assets/images/MWall_GM.png
+++ /dev/null
diff --git a/assets/images/MWall_NM.png b/assets/images/MWall_NM.png
deleted file mode 100755
index 2650bc07..00000000
--- a/assets/images/MWall_NM.png
+++ /dev/null
diff --git a/assets/images/Ref.png b/assets/images/Ref.png
deleted file mode 100755
index 226e4200..00000000
--- a/assets/images/Ref.png
+++ /dev/null
diff --git a/assets/images/Spec.png b/assets/images/Spec.png
deleted file mode 100755
index 76658540..00000000
--- a/assets/images/Spec.png
+++ /dev/null
diff --git a/assets/images/Thumbs.db b/assets/images/Thumbs.db
deleted file mode 100755
index fa66bbc8..00000000
--- a/assets/images/Thumbs.db
+++ /dev/null
diff --git a/assets/images/black.tga b/assets/images/black.tga
deleted file mode 100755
index 69124ff0..00000000
--- a/assets/images/black.tga
+++ /dev/null
diff --git a/assets/images/cube.png b/assets/images/cube.png
deleted file mode 100755
index 6cb3ef82..00000000
--- a/assets/images/cube.png
+++ /dev/null
diff --git a/assets/images/cubelight_Glow.png b/assets/images/cubelight_Glow.png
deleted file mode 100755
index 4f8c922f..00000000
--- a/assets/images/cubelight_Glow.png
+++ /dev/null
diff --git a/assets/images/cubelight_spec.png b/assets/images/cubelight_spec.png
deleted file mode 100755
index 5cfe820b..00000000
--- a/assets/images/cubelight_spec.png
+++ /dev/null
diff --git a/assets/images/default_white.png b/assets/images/default_white.png
deleted file mode 100755
index cca49ba7..00000000
--- a/assets/images/default_white.png
+++ /dev/null