Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 20 insertions, 0 deletions

diff --git a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js
new file mode 100644
index 00000000..0bced41b
--- /dev/null
+++ b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js
@@ -0,0 +1,20 @@
+var Montage = require("montage").Montage,
+    Component = require("ui/component").Component;
+
+var Image = exports.Image = Montage.create(Component, {
+
+    _src: {value: null},
+
+    src: {
+        set: function(value) {
+            this._src = value;
+            this.needsDraw = true;
+        }
+    },
+
+    draw: {
+        value: function() {
+            this._element.style.backgroundImage = "url(" + this._src + ")";
+        }
+    }
+});