Merge branch 'master' into brushtool

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

1 files changed, 24 insertions, 0 deletions

diff --git a/node_modules/montage/examples/feed-reader/map-example.reel/main.js b/node_modules/montage/examples/feed-reader/map-example.reel/main.js
new file mode 100644
index 00000000..54b84425
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/map-example.reel/main.js
@@ -0,0 +1,24 @@
+/* <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/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+
+
+exports.Main = Montage.create(Component, {
+
+    templateDidLoad: {
+        value: function() {
+            //console.log("main templateDidLoad")
+        }
+    },
+
+    prepareForDraw: {
+        value: function() {
+            //console.log("main prepareForDraw")
+        }
+    }
+
+});