Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

Conflicts:
	css/ninja.css
	js/stage/stage.reel/stage.html
	js/tools/TextTool.js
	node_modules/labs/rich-text-editor.reel/rich-text-editor.css
	node_modules/labs/rich-text-editor.reel/rich-text-editor.html
	node_modules/labs/rich-text-editor.reel/rich-text-editor.js
	node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
	node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 0 insertions, 33 deletions

diff --git a/_scss/imports/scss/_Components.scss b/_scss/imports/scss/_Components.scss
deleted file mode 100644
index c4182c73..00000000
--- a/_scss/imports/scss/_Components.scss
+++ /dev/null
@@ -1,33 +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>
-
-
-
-// Begin: Styles for the Tree component  
-
-.tree
-{
-    -webkit-user-select:none;
-    cursor:default;
-    float: left;
-    padding-left: 0;
-    color: $color-panel-text;
-}
-
-.tree li
-{
-    -webkit-margin-before: 0px;
-    -webkit-margin-after: 0px;
-    list-style-type:none;
-}
-
-.tree li > text > img
-{
-    margin-right:8px;
-    -webkit-transition: -webkit-transform 0.05s linear;
-}
-
-// End: styles for the Tree component  
\ No newline at end of file