17 files changed, 273 insertions, 135 deletions

diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json
index 796b2fad..655d222d 100644
--- a/node_modules/components-data/map.json
+++ b/node_modules/components-data/map.json
@@ -8,8 +8,8 @@
     "properties": [
         {
             "name": "category",
-            "type": "string",
-            "default": "",
+            "type": "select",
+            "default": "restaurant",
             "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
         },
         {
@@ -18,5 +18,11 @@
             "default": ""
         }
 
-    ]
+    ],
+
+    "defaultStyles":  {
+        "width": "280px",
+        "height": "280px"
+    }
+
 }
\ No newline at end of file
diff --git a/node_modules/components-data/youtube-channel.json b/node_modules/components-data/youtube-channel.json
index 8affffba..c909fd1b 100644
--- a/node_modules/components-data/youtube-channel.json
+++ b/node_modules/components-data/youtube-channel.json
@@ -7,7 +7,7 @@
 
     "properties": [
         {
-            "name": "channelUrl",
+            "name": "channel",
             "type": "string",
             "default": ""
         }
diff --git a/node_modules/montage/examples/feed-reader/images/47-fuel.png b/node_modules/montage/examples/feed-reader/images/47-fuel.png
new file mode 100644
index 00000000..617d7640
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/47-fuel.png
diff --git a/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png b/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png
new file mode 100644
index 00000000..51a5f86f
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png
diff --git a/node_modules/montage/examples/feed-reader/images/88-beer-mug.png b/node_modules/montage/examples/feed-reader/images/88-beer-mug.png
new file mode 100644
index 00000000..b0fdd99a
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/88-beer-mug.png
diff --git a/node_modules/montage/examples/feed-reader/main.reel/main.html b/node_modules/montage/examples/feed-reader/main.reel/main.html
index 8ea9a79b..50bac601 100644
--- a/node_modules/montage/examples/feed-reader/main.reel/main.html
+++ b/node_modules/montage/examples/feed-reader/main.reel/main.html
@@ -44,7 +44,9 @@
         "module": "montage/ui/feed-reader/feed-reader.reel",
         "name": "FeedReader",
         "properties": {
-            "element": {"#": "feed-reader"}
+            "element": {"#": "feed-reader"},
+            "feedDisplayMode": "timed",
+            "interval": "5"
         }
     },
     
@@ -76,9 +78,29 @@
     "map": {
         "prototype": "montage/ui/map.reel",
         "properties": {
-            "element": {"#": "map"}
+            "element": {"#": "map"},
+            "traffic": false
+        },
+        "bindings": {
+            "traffic": {
+                "boundObject": {"@": "traffic"},
+                "boundObjectPropertyPath": "checked"
+            }
+        }
+    },
+    
+    "types": {
+        "prototype": "montage/ui/select-input.reel",
+        "properties": {
+            "element": {"#": "types"}
         }
     },
+    "traffic": {
+        "prototype": "montage/ui/checkbox.reel",
+        "properties": {
+            "element": {"#": "traffic"}
+        }        
+    },
 
     "owner": {
         "module": "main.reel",
@@ -92,6 +114,10 @@
             "mapCenter": {
                 "boundObject": {"@": "mapCenter"},
                 "boundObjectPropertyPath": "value"
+            },
+            "mapCategory": {
+                "boundObject": {"@": "types"},
+                "boundObjectPropertyPath": "value"
             }
         }
     }
@@ -140,6 +166,22 @@
             visibility: hidden;
         }
         
+        #map, #feed-reader {
+            margin-top: 10px;
+        }
+        
+        /*
+        .feed-reader .feed-entry {
+            visibility:hidden;
+            opacity:0;
+            transition:visibility 0s linear 0.5s,opacity 0.5s linear;
+        }
+        .feed-reader .feed-entry .active {
+            visibility:visible;
+            opacity:1;
+            transition-delay:0s;
+        }
+        */
 
     </style>
 
@@ -168,6 +210,18 @@
                     <form>
                         Location: <input type="text" value="Paris, France" id="map-center" required />
                         <input type="button" id="btn-map" class="btn primary" value="OK"></button>
+                        <div>
+                            Show: 
+                            <select data-montage-id="types">
+                                <option value=''>Select a Category</option>
+                                <option value='grocery_or_supermarket'>Groceries/Supermarkets</option>
+                                <option value='hospital'>Hospitals</option>
+                                <option value='restaurant'>Restaurants</option>
+                                <option value='bar'>Bars</option>
+                                <option value='gas_station'>Gas Stations</option>
+                            </select>
+                        </div>
+                        <input type="checkbox" id="traffic">Show Traffic</input>
                     </form>
                 </div>
                 <div id="map">Map</div>
diff --git a/node_modules/montage/examples/feed-reader/main.reel/main.js b/node_modules/montage/examples/feed-reader/main.reel/main.js
index bea5f91a..06d8fdba 100644
--- a/node_modules/montage/examples/feed-reader/main.reel/main.js
+++ b/node_modules/montage/examples/feed-reader/main.reel/main.js
@@ -13,6 +13,16 @@ exports.Main = Montage.create(Component, {
         distinct: true
     },
     
+    mapCategory: {
+        get: function() {
+            return this._mapCategory;
+        },
+        set: function(value) {
+            this._mapCategory = value;
+            this.map.category = value;
+        }
+    },
+    
     feedReader: {value: null},
     
     map: {value: null},
diff --git a/node_modules/montage/examples/youtube-channel-example/index.html b/node_modules/montage/examples/youtube-channel-example/index.html
index b313d5d8..f3a0592a 100755
--- a/node_modules/montage/examples/youtube-channel-example/index.html
+++ b/node_modules/montage/examples/youtube-channel-example/index.html
@@ -14,7 +14,8 @@
         "player": {
             "prototype": "montage/ui/youtube-channel.reel",
             "properties": {
-                "element": {"#": "player"}
+                "element": {"#": "player"},
+                "channel": "drive"