4 files changed, 57 insertions, 15 deletions

diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index c460066c..e5606655 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -122,6 +122,32 @@
                 "data/sqlaccess/sqlstore.js",
                 "data/store.js",
                 "data/transactionid.js",
+                "examples/feed-reader/images/07-map-marker.png",
+                "examples/feed-reader/images/10-medical.png",
+                "examples/feed-reader/images/100-coffee.png",
+                "examples/feed-reader/images/107-widescreen.png",
+                "examples/feed-reader/images/125-food.png",
+                "examples/feed-reader/images/142-wine-bottle.png",
+                "examples/feed-reader/images/34-coffee.png",
+                "examples/feed-reader/images/35-shopping.png",
+                "examples/feed-reader/images/38-airplane.png",
+                "examples/feed-reader/images/41-picture-frame.png",
+                "examples/feed-reader/images/47-fuel.png",
+                "examples/feed-reader/images/48-fork-and-knife.png",
+                "examples/feed-reader/images/80-shopping-cart.png",
+                "examples/feed-reader/images/87-wine-glass.png",
+                "examples/feed-reader/images/88-beer-mug.png",
+                "examples/feed-reader/index.html",
+                "examples/feed-reader/main.reel/main.html",
+                "examples/feed-reader/main.reel/main.js",
+                "examples/feed-reader/map-example.reel/main.css",
+                "examples/feed-reader/map-example.reel/main.html",
+                "examples/feed-reader/map-example.reel/main.js",
+                "examples/feed-reader/package.json",
+                "examples/youtube-channel-example/index.html",
+                "examples/youtube-channel-example/package.json",
+                "examples/youtube-channel-example/style.css",
+                "examples/youtube-channel-example/youtube-channel-example.js",
                 "montage.js",
                 "node.js",
                 "package.json",
@@ -169,6 +195,7 @@
                 "ui/component.js",
                 "ui/composer/composer.js",
                 "ui/composer/long-press-composer.js",
+                "ui/composer/press-composer.js",
                 "ui/composer/swipe-composer.js",
                 "ui/composer/translate-composer.js",
                 "ui/condition.reel/condition.js",
@@ -219,21 +246,19 @@
                 "ui/popup/popup.reel/popup.css",
                 "ui/popup/popup.reel/popup.html",
                 "ui/popup/popup.reel/popup.js",
-                "ui/progress.reel/progress.css",
-                "ui/progress.reel/progress.html",
                 "ui/progress.reel/progress.js",
-                "ui/progress.reel/rule.png",
-                "ui/progress.reel/scroll.png",
                 "ui/radio-button.reel/radio-button.js",
                 "ui/range-input.reel/range-input.js",
                 "ui/repetition.reel/repetition.js",
                 "ui/scroll-bars.reel/scroll-bars.html",
                 "ui/scroll-bars.reel/scroll-bars.js",
-                "ui/scroll.js",
                 "ui/scroller.reel/scroller.html",
                 "ui/scroller.reel/scroller.js",
                 "ui/scrollview.reel/scrollview.js",
                 "ui/select-input.reel/select-input.js",
+                "ui/skeleton/range-input.reel/range-input.css",
+                "ui/skeleton/range-input.reel/range-input.html",
+                "ui/skeleton/range-input.reel/range-input.js",
                 "ui/slot.reel/slot.js",
                 "ui/substitution.reel/substitution.js",
                 "ui/tabs.reel/tabs.css",
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
index 6774026b..34f207b4 100755
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
@@ -15,7 +15,8 @@
             "prototype": "montage/ui/picasa-carousel.reel",
             "properties": {
                 "element": {"#": "montage-google-picasa-carousel"},
-                "searchResultsList": {"@": "searchResultsList"}
+                "searchResultsList": {"@": "searchResultsList"},
+                "flow": {"@": "flow1"}
             }
                 },
             "searchResultsController": {
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
index 1f5e7dd0..b41df9a6 100644
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
@@ -20,6 +20,16 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
                 value: null
             },
 
+        flow: {
+            value: null
+        },
+
+        initialPosition: {
+            value: 2300
+        },
+
+
+
         _queryParameter: {
             enumerable: false,
             value: null
@@ -37,7 +47,7 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
 
             resultCount: {
                 enumerable: false,
-                value: 20
+                value: 40
             },
 
             prepareForDraw: {
@@ -103,6 +113,8 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
                 value: function(evt) {
                     var response = JSON.parse(evt.target.responseText);
                     this.searchResults = response.feed.entry;
+                this.flow.length = this.initialPosition;
+                this.flow.origin = this.initialPosition;
                     this.isSearching = false;
                 }
             },
diff --git a/node_modules/tools/template-creator.js b/node_modules/tools/template-creator.js
index 6b50cc1e..e312cd32 100644
--- a/node_modules/tools/template-creator.js
+++ b/node_modules/tools/template-creator.js
@@ -31,18 +31,19 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
     },
 
     initWithHeadAndBodyElements: {
-        value: function(head, body, montageJsPath) {
+        value: function(head, body, components, montageJsPath) {
             var serializer = this.serializer,
                 objects = {},
-                components = {},
+                //components = {},
                 doc,
                 script,
                 self = this;
 
             this._objectNamesIndex = {};
-            doc = this._document = document.implementation.createHTMLDocument("");
+            //doc = this._document = document.implementation.createHTMLDocument("");
 
-            function copyNode(sourceNode, targetNode, isRootNode) {
+            /*
+function copyNode(sourceNode, targetNode, isRootNode) {
                 var childNodes = sourceNode.childNodes,
                     childNode,
                     targetChildNode,
@@ -54,7 +55,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                     label = self._generateLabelForComponent(component);
                     targetNode.setAttribute("id", label);
                     component._element = targetNode;
-                    components[label] = component;
+                    //components[label] = component;
                 } else {
                     for (var i = 0; (childNode = childNodes[i]); i++) {
                         targetChildNode = targetNode.appendChild(childNode.cloneNode(false));
@@ -62,8 +63,10 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                     }
                 }
             }
+*/
 
-            if (head) {
+            /*
+if (head) {
                 doc.head.innerHTML = head.innerHTML;
             }
             if (montageJsPath) {
@@ -82,11 +85,12 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                 // the first child is the title
                 doc.head.insertBefore(doc.createTextNode("\n    "), doc.head.firstChild);
             }
+*/
 
-            copyNode(body, this._document.body, true);
+            //copyNode(body, this._document.body, true);
             this._ownerSerialization = serializer.serialize(components);
             this._externalObjects = serializer.getExternalObjects();
-
+                        
             return this;
         }