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

diff --git a/node_modules/montage/ui/image2.reel/image2.js b/node_modules/montage/ui/image2.reel/image2.js
deleted file mode 100644
index 750b837a..00000000
--- a/node_modules/montage/ui/image2.reel/image2.js
+++ /dev/null
@@ -1,26 +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> */
-
-var Montage = require("montage").Montage,
-    Component = require("ui/component").Component;
-
-var Image2 = exports.Image2 = Montage.create(Component, {
-
-    _src: {value: null},
-    
-    src: {
-        set: function(value) {
-            this._src = value;
-            this.needsDraw = true;
-        }
-    },
-    
-    draw: {
-        value: function() {
-            this._element.style.background = "url(" + this._src + ")";
-        }
-    }
-});
\ No newline at end of file