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

diff --git a/_scss/imports/scss/_mixins.scss b/_scss/imports/scss/_mixins.scss
deleted file mode 100644
index 061262f7..00000000
--- a/_scss/imports/scss/_mixins.scss
+++ /dev/null
@@ -1,20 +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>
-
-
-// mixins.scss
-// Generic mixins.  Theme-specific mixins (e.g. for sprites) 
-// should go in the theme/themename/mixins.scss file.
-
-
-// Mixin to set the Opacity of an Element
-@mixin opacity($opacity){
-    opacity:$opacity;
-}
-
-@mixin marginTop($mTop){
-    margin-top:$mTop;
-}