24 files changed, 42 insertions, 25 deletions

diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 579264cb..c5ccbc82 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
-                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"},
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"},
                 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"}
         ]
 }
\ No newline at end of file
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 50171260..45353a08 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1220,7 +1220,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             for(i=0;i<arrSelectedIndexesLength;i++){
                 for(j=0;j<currentLayersSelectedLength;j++){
 
-                    if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){
+                    if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
                         matchedValues+=1;
                     }
                 }
@@ -1773,6 +1773,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                                 currentLayersSelectedLength = this.currentLayersSelected.length,
                                 arrLayersLength = this.arrLayers.length,
                                 returnVal = arrLayersLength -1;
+                        if (returnVal === -1) {
+                                return false;
+                        }
                         if (this.currentLayersSelected === false) {
                                 return false;
                         }
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index ab033433..073a4438 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -300,8 +300,11 @@ exports.ComponentsPanel = Montage.create(Component, {
 
     componentInstanceOnFirstDraw: {
         value: function(instance) {
+            var addDelegate = this.application.ninja.elementMediator.addDelegate;
+            this.application.ninja.elementMediator.addDelegate = null;
             this.application.ninja.elementMediator.addElements(instance.element);
             this.application.ninja.currentDocument.model.mObjects.push(instance);
+            this.application.ninja.elementMediator.addDelegate = addDelegate;
         }
     },
 
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json
index e80fa510..4a3da3c6 100644
--- a/node_modules/components-data/map.json
+++ b/node_modules/components-data/map.json
@@ -10,7 +10,7 @@
             "name": "category",
             "type": "select",
             "default": "restaurant",
-            "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
+            "possibleValues": ["", "restaurant", "hospital", "cafe", "museum"]
         },
         {
             "name": "center",
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index b6868954..9a2177c6 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -82,7 +82,11 @@
                         {"name": "feed-reader.reel"}
                     ]
                 },
-                {"name": "map.reel"},
+                {"name": "map.reel",
+                    "children": [
+                        {"name": "icons"}
+                    ]
+                },
                 {"name": "picasa-carousel.reel",
                     "children": [
                         {"name": "image.reel"}
@@ -370,6 +374,10 @@
         "montage-google/map.reel/map.js",
         "montage-google/map.reel/map.html",
         "montage-google/map.reel/map.css",
+        "montage-google/map.reel/icons/fork-and-knife.png",
+        "montage-google/map.reel/icons/medical.png",
+        "montage-google/map.reel/icons/picture-frame.png",
+        "montage-google/map.reel/icons/cafe.png",
         "montage-google/picasa-carousel.reel/image.reel/image.html",
         "montage-google/picasa-carousel.reel/image.reel/image.js",
         "montage-google/picasa-carousel.reel/picasa-carousel.css",
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
index 332b2932..66471eab 100644
--- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
+++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
@@ -45,7 +45,6 @@
         }
     },
     "owner": {
-        "prototype": "feed-reader/feed-entry.reel",
         "properties": {
             "element": {"#": "feed-entry"}
         }
@@ -76,6 +75,7 @@
 </head>
 <body>
     <div class="feed-entry" data-montage-id="feed-entry">
+
         <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a>
         <p data-montage-id="entry-description" class="entry-description"></p>
     </div>
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
index 4d6792a1..a5c1346f 100644
--- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
+++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
@@ -38,7 +38,6 @@
     },
 
     "owner": {
-        "prototype": "feed-reader/feed-reader.reel",
         "properties": {
             "element": {"#": "feed-reader"}
         }
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js
index 34533d6d..3c139c60 100644
--- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js
+++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js
@@ -16,11 +16,8 @@ exports.FeedReader = Montage.create(Component, {
         value: function() {
             var self = this;
             var apiInit = function() {
-                console.log('google api initialized');
-
                 google.load("feeds", "1", {
                     callback: function() {
-                        console.log('google feeds api loaded');
                         self._apiLoaded = true;
                         self.feedURL = self._feedURL;
                         self.needsDraw = true;
diff --git a/node_modules/montage-google/map.reel/icons/airplane.png b/node_modules/montage-google/map.reel/icons/airplane.png
new file mode 100644
index 00000000..dfcbbc78
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/airplane.png
diff --git a/node_modules/montage-google/map.reel/icons/cafe.png b/node_modules/montage-google/map.reel/icons/cafe.png
new file mode 100644
index 00000000..4e9c517a
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/cafe.png
diff --git a/node_modules/montage-google/map.reel/icons/coffee.png b/node_modules/montage-google/map.reel/icons/coffee.png
new file mode 100644
index 00000000..4c4bedad
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/coffee.png
diff --git a/node_modules/montage-google/map.reel/icons/food.png b/node_modules/montage-google/map.reel/icons/food.png
new file mode 100644
index 00000000..81afd74a
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/food.png
diff --git a/node_modules/montage-google/map.reel/icons/fork-and-knife.png b/node_modules/montage-google/map.reel/icons/fork-and-knife.png
new file mode 100644
index 00000000..06d91088
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/fork-and-knife.png
diff --git a/node_modules/montage-google/map.reel/icons/map-marker.png b/node_modules/montage-google/map.reel/icons/map-marker.png
new file mode 100644
index 00000000..a5d99d69
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/map-marker.png
diff --git a/node_modules/montage-google/map.reel/icons/medical.png b/node_modules/montage-google/map.reel/icons/medical.png
new file mode 100644
index 00000000..ab78c783
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/medical.png
diff --git a/node_modules/montage-google/map.reel/icons/picture-frame.png b/node_modules/montage-google/map.reel/icons/picture-frame.png
new file mode 100644
index 00000000..6deee997
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/picture-frame.png
diff --git a/node_modules/montage-google/map.reel/icons/shopping.png b/node_modules/montage-google/map.reel/icons/shopping.png
new file mode 100644
index 00000000..03689f99
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/shopping.png
diff --git a/node_modules/montage-google/map.reel/icons/widescreen.png b/node_modules/montage-google/map.reel/icons/widescreen.png
new file mode 100644
index 00000000..2e5f1ba7
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/widescreen.png
diff --git a/node_modules/montage-google/map.reel/icons/wine-bottle.png b/node_modules/montage-google/map.reel/icons/wine-bottle.png
new file mode 100644
index 00000000..a7df9e97
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/wine-bottle.png