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

diff --git a/_scss/config.rb b/_scss/config.rb
deleted file mode 100755
index 23327bde..00000000
--- a/_scss/config.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Require any additional compass plugins here.
-# Set this to the root of your project when deployed:
-http_path = "/"
-css_dir = "../css"
-sass_dir = ""
-images_dir = "../images/"
-javascripts_dir = "../js"
-output_style = :compact
-line_comments = false
-# To enable relative paths to assets via compass helper functions. Uncomment:
-# relative_assets = true