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

diff --git a/node_modules/montage/ui/hottextunit.reel/hottextunit.css b/node_modules/montage/ui/hottextunit.reel/hottextunit.css
deleted file mode 100644
index 9476415c..00000000
--- a/node_modules/montage/ui/hottextunit.reel/hottextunit.css
+++ /dev/null
@@ -1,41 +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> */
-
-.hottextunit
-{
-    -webkit-user-select:none;
-    cursor:default;
-    width:50px;
-    float:left;
-}
-
-.hottextunit:hover
-{
-    cursor: pointer;
-}
-
-.hottextunit input
-{
-    width:50px;
-    border:none;
-    padding:0;
-    margin:0;
-}
-
-.underline
-{
-    border-bottom:1px dotted white;
-}
-
-.hide
-{
-    display:none;
-}
-
-.disabled
-{
-    color:#999999;
-}
\ No newline at end of file