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

Conflicts:
	js/controllers/styles-controller.js

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

1 files changed, 0 insertions, 28 deletions

diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css
deleted file mode 100755
index e62a20a9..00000000
--- a/js/document/templates/montage-web/default_html.css
+++ /dev/null
@@ -1,28 +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> */
-
-* {
-    -webkit-transition-duration: 0s !important;
-    -webkit-animation-duration: 0s !important;
-    -webkit-animation-name: none !important;
-}
-
-body {
-    margin: 0;
-    padding: 0;
-
-    position: absolute;
-    -webkit-transform-style: preserve-3d;
-    -webkit-perspective: 1400px;
-}
-
-.active-element-outline {
-    outline: #adff2f solid 2px;
-}
-
-.nj-preset-transition {
-    -webkit-transition: all 450ms linear !important;
-}
\ No newline at end of file