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

diff --git a/_scss/imports/scss/_ToolsSample.scss b/_scss/imports/scss/_ToolsSample.scss
deleted file mode 100644
index 2e1da9a8..00000000
--- a/_scss/imports/scss/_ToolsSample.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-@charset "UTF-8";
-// <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>
-
-// Image Sprinting
-.ovalToolUp {
-  background-image: url("../images/SpriteSheets/NinjaSpriteSheet.png");
-  background-repeat: no-repeat;
-  background-position: 0px 0px;
-  height: 23px;
-  width: 26px; }