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, 12 deletions

diff --git a/_scss/imports/codemirror/_javascript.scss b/_scss/imports/codemirror/_javascript.scss
deleted file mode 100644
index 1124e279..00000000
--- a/_scss/imports/codemirror/_javascript.scss
+++ /dev/null
@@ -1,12 +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> */
-
-span.js-keyword {color: #90b;}
-span.js-atom {color: #291;}
-span.js-variabledef {color: #00f;}
-span.js-localvariable {color: #049;}
-span.js-comment {color: #a70;}
-span.js-string {color: #a22;}