Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

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

1 files changed, 2 insertions, 2 deletions

diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js
index c1c97b2b..2b3ed64e 100755
--- a/node_modules/montage/core/deserializer.js
+++ b/node_modules/montage/core/deserializer.js
@@ -142,7 +142,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
         return this;
     }},
 
-    initWithObjectAndRequire: {value: function(string, require, origin) {
+    initWithObjectAndRequire: {value: function(object, require, origin) {
         this._reset();
         this._serializationString = JSON.stringify(object);
         this._require = require;
@@ -1075,7 +1075,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
             object;
 
         for (var label in objects) {
-            if (label in labels) {
+            if (labels[label] != null) { // we should call deserializedFromSerialization on all instantiated objects even if they were passed as null/undefined in instances.
                 continue;
             }
             object = objects[label];