Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 12 insertions, 2 deletions

diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index ed8d0656..39a98d82 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -140,7 +140,7 @@
     padding: 0px;
     top: 0px;
     left: 0px;
-    z-index: 6;
+    z-index: 7;
 }
 
 
@@ -151,7 +151,7 @@
     padding: 0px;
     top: 0px;
     left: 0px;
-    z-index: 5;
+    z-index: 6;
 }
 
 .layoutCanvas {
@@ -161,6 +161,16 @@
     padding: 0px;
     top: 0px;
     left: 0px;
+    z-index: 5;
+}
+
+.gridCanvas {
+    position: absolute;
+    margin: 0px;
+    border: none;
+    padding: 0px;
+    top: 0px;
+    left: 0px;
     z-index: 4;
 }