Squashed commit of the following:

commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 18 13:48:21 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:29:41 2012 -0700

    updating the picasa carousel

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:03:50 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 11 10:39:36 2012 -0700

    integrating new picasa carousel component

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 10 14:33:00 2012 -0700

    fixed the text area case issue

    Text area was renamed from TextArea to Textarea

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Mon Apr 9 22:10:45 2012 -0700

    integrating montage v0.8 into ninja.

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

10 files changed, 981 insertions, 176 deletions

diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js
index 7e812235..b8ed5618 100755
--- a/node_modules/montage/core/deserializer.js
+++ b/node_modules/montage/core/deserializer.js
@@ -98,6 +98,26 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
     }},
 
     /**
+     Initializes the deserializer with a string
+     @param {String|Object} serialization A string or JSON-style object
+     describing the serialized objects.
+     @param {Function} require The module loader for the containing package.
+     @param {String} origin Usually a file name.
+     */
+    init: {
+        value: function (serialization, require, origin) {
+            if (typeof serialization !== "string") {
+                serialization = JSON.stringify(serialization);
+            }
+            this._reset();
+            this._serializationString = serialization;
+            this._require = require;
+            this._origin = origin;
+            return this;
+        }
+    },
+
+    /**
      Initializes the deserializer with a string of serialized objects.
      @function
      @param {String} string A string of serialized objects.
@@ -122,6 +142,14 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
         return this;
     }},
 
+    initWithObjectAndRequire: {value: function(string, require, origin) {
+        this._reset();
+        this._serializationString = JSON.stringify(object);
+        this._require = require;
+        this._origin = origin;
+        return this;
+    }},
+
     /**
      Initializes the deserializer object with a serialization string and the require object used to load the modules containing the object's prototypes.
      @function
@@ -168,8 +196,37 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
 
         return objectsArray;
     }},
+
+    chainDeserializer: {
+        value: function(deserializer) {
+            var chainedSerializations = this._chainedSerializations,
+                optimizedIds, chainedOptimizedIds;
+
+            if (!chainedSerializations) {
+                this._chainedSerializations = chainedSerializations = [];
+            }
+
+            chainedSerializations.push({
+                string: deserializer._serializationString,
+                compiledFunction: deserializer._compiledDeserializationFunction,
+                compiledFunctionString: deserializer._compiledDeserializationFunctionString
+            });
+
+            // need to copy the optimized ids too, ideally all chained templates are optimized for the same document
+            chainedOptimizedIds = deserializer._optimizedIds;
+            if (chainedOptimizedIds) {
+                if (!optimizedIds) {
+                    this._optimizedIds = optimizedIds = {};
+                }
+                for (var id in chainedOptimizedIds) {
+                    optimizedIds[id] = chainedOptimizedIds[id];
+                }
+            }
+        }
+    },
+
     /**
-     This function is to be used in the context of deserializeSelf delegate used for custom object deserializations.
+     This function is to be used in the context of deserializeProperties delegate used for custom object deserializations.
      It reads an entry from the "properties" serialization unit of the object being deserialized.
      @function
      @param {string} name The name of the entry to be read.
@@ -182,8 +239,93 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
         return stack[ix][name];
     }},
 
+    deserializeProperties: {
+        value: function() {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                object = stack[ix-1],
+                desc = stack[ix];
+
+            this._deserializeProperties(object, desc.properties);
+        }
+    },
+
+    getProperty: {
+        value: function(name) {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                desc = stack[ix];
+
+            return desc.properties[name];
+        }
+    },
+
+    deserializeUnits: {
+        value: function() {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                desc = stack[ix];
+
+            desc._units = this._indexedDeserializationUnits;
+        }
+    },
+
+    deserializeUnit: {
+        value: function(name) {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                desc = stack[ix],
+                units;
+
+            if (desc._units) {
+                units = desc._units;
+            } else {
+                desc._units = units = {};
+            }
+
+            units[name] = this._indexedDeserializationUnits[name];
+        }
+    },
+
+    getType: {
+        value: function() {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                desc = stack[ix];
+
+            return "object" in desc ? "object" : ("prototype" in desc ? "prototype" : null);
+        }
+    },
+
+    getTypeValue: {
+        value: function() {
+            var stack = this._objectStack,
+                ix = stack.length - 1,
+                desc = stack[ix];
+
+            return desc.object || desc.prototype;
+        }
+    },
+
+    getObjectByLabel: {
+        value: function(label) {
+            return this._objects[label] || this._objectLabels[label];
+        }
+    },
+
+    _customDeserialization: {
+        enumerable: false,
+        value: function(object, desc) {
+            this._pushContextObject(object);
+            this._pushContextObject(desc);
+            object.deserializeSelf(this);
+            this._popContextObject();
+            this._popContextObject();
+        }
+    },
+
     /**
-    This function is to be used in the context of deserializeSelf delegate used for custom object deserializations.
+    This function is to be used in the context of deserializeProperties delegate used for custom object deserializations.
      It deserializes all the named properties of a serialized object into the object given.
     @function
     @param {Object} object The target of the properties.
@@ -383,7 +525,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
         var serialization = this._serialization,
             moduleIds = this._requiredModuleIds = [],
             modules = this._modules,
-            desc, moduleId;
+            desc, moduleId, name, objectLocation;
 
         for (var label in serialization) {
             desc = serialization[label];
@@ -391,7 +533,8 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri