Merge branch 'refs/heads/master' into binding

Conflicts:
	js/document/models/html.js
	js/document/views/design.js
	js/ninja.reel/ninja.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js
index 800e073c..0b669b80 100644
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js
@@ -138,13 +138,20 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
 
         draw: {
             value: function() {
-    
+
                 if (this.isSearching) {
                     this.element.classList.add("searching");
                 } else {
                     this.element.classList.remove("searching");
                 }
-    
+
+            }
+        },
+
+        serializeProperties: {
+            value: function(serializer) {
+                serializer.set("element", this.element);
+                serializer.set("queryParameter", this.queryParameter);
             }
         }