19 files changed, 24 insertions, 21 deletions
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/node_modules/montage-google/map.reel/icons/wine-glass.png b/node_modules/montage-google/map.reel/icons/wine-glass.png
new file mode 100644
index 00000000..b4d34474
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/wine-glass.png
Binary files differ
diff --git a/node_modules/montage-google/map.reel/map.js b/node_modules/montage-google/map.reel/map.js
index 4e3a6d70..1aeb97df 100644
--- a/node_modules/montage-google/map.reel/map.js
+++ b/node_modules/montage-google/map.reel/map.js
@@ -117,9 +117,12 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                this._category = value;
                if (this._map && this.latLng) {
                    this._getPlaces(this._category);
-                    this.needsDraw = true;
                }
+            } else {
+                this._places = [];
            }
+            this.needsDraw = true;
        }
    },
@@ -186,26 +189,30 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
            var icon, image;
            switch(this.category) {
                case 'restaurant':
-                icon = '48-fork-and-knife.png';
+                icon = 'fork-and-knife.png';
                break;
                case 'hospital':
-                icon = '10-medical.png';
+                icon = 'medical.png';
                break;
                case 'bar':
-                icon = '88-beer-mug.png';
+                icon = 'beer-mug.png';
                break;
                case 'grocery_or_supermarket':
-                icon = '80-shopping-cart.png';
+                icon = 'shopping.png';
                break;
                case 'museum':
-                icon = '41-picture-frame.png';
+                icon = 'picture-frame.png';
                break;
                case 'gas_station':
-                icon = '47-fuel.png';
+                icon = 'fuel.png';
                break;
-            };
+                case 'cafe':
+                    icon = 'cafe.png';
+                    break;
+            }
            if(icon) {
-                image = new google.maps.MarkerImage('images/' + icon);
+                image = new google.maps.MarkerImage(this._montage_metadata.require.modules['map.reel/map'].directory + 'icons/' + icon);
            }
            var options = {
                map: map,
@@ -289,6 +296,8 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                     for (var i = 0; i < places.length; i++) {
                         this._createMarker(places[i]);
                     }
+                 } else {
+                     this._removeAllMarkers();
                 }
                 if(this.traffic === true) {
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
index 8712c228..b5949299 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
@@ -12,7 +12,6 @@
    <script type="text/montage-serialization">
    {
        "owner": {
-            "prototype": "picasa-carousel.reel",
            "properties": {
                "element": {"#": "montage-google-picasa-carousel"},
                "flow": {"@": "flow"}
diff --git a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
index 112fda72..01cc42f3 100644
--- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
+++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
@@ -41,7 +41,6 @@
        },
        "owner": {
-            "module": "youtube-channel.reel",
            "name": "YoutubeChannel",
            "properties": {
                "element": {"#": "container"},
diff --git a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js
index ca08564b..95cd336a 100644
--- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js
+++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js
@@ -124,6 +124,8 @@ var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {
    draw: {