Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 0 insertions, 27 deletions

diff --git a/node_modules/montage/ui/hottext.reel/hottext.css b/node_modules/montage/ui/hottext.reel/hottext.css
deleted file mode 100644
index 34b353f4..00000000
--- a/node_modules/montage/ui/hottext.reel/hottext.css
+++ /dev/null
@@ -1,27 +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> */
-
-.hottext {
-    cursor: default;
-    border:none;
-    border-bottom:1px dotted white;
-    width:50px;
-    text-align:center;
-    -webkit-user-select:none;
-    outline:none;
-}
-
-.hottext:hover
-{
-    cursor: pointer;
-}
-
-.hottextInput
-{
-    cursor: default;
-    width:50px;
-    text-align:center;
-}
\ No newline at end of file