Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/components/tools-properties/brush-properties.reel/brush-properties.html
	js/components/tools-properties/fill-properties.reel/fill-properties.html
	js/components/tools-properties/pen-properties.reel/pen-properties.html
	js/components/tools-properties/pencil-properties.reel/pencil-properties.html
	js/components/tools-properties/selection-properties.reel/selection-properties.html
	js/components/tools-properties/shape-properties.reel/shape-properties.html
	js/components/tools-properties/tag-properties.reel/tag-properties.html
	js/components/tools-properties/text-properties.reel/text-properties.html

95 files changed, 3380 insertions, 1850 deletions

diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js
index b8ed5618..c1c97b2b 100755
--- a/node_modules/montage/core/deserializer.js
+++ b/node_modules/montage/core/deserializer.js
@@ -332,11 +332,6 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
     @param {Array} properties The property names to be deserialized.
     */
     deserializePropertiesForObject: {value: function(object, properties) {
-        // TODO: ensure backward compatibility
-        if (properties && "childComponents" in properties) {
-            properties.childComponents = [];
-            console.log('Warning: "childComponents" isn\'t supported on components within the current serializaation format, this property will be reset to [].');
-        }
         for (var key in properties) {
             object[key] = properties[key];
         }
@@ -846,8 +841,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
                     if (id) {
                         return 'element.getElementById("' + id + '")';
                     } else {
-                        // TODO: getElemenyById only here for backwards compatibility
-                        return 'element.querySelector(\'*[' + Deserializer._MONTAGE_ID_ATTRIBUTE + '="' + value + '"]\') || element.getElementById("' + value + '")';
+                        return 'element.querySelector(\'*[' + Deserializer._MONTAGE_ID_ATTRIBUTE + '="' + value + '"]\')';
                     }
                     break;
 
@@ -859,7 +853,8 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
                     break;
 
                 case "reference":
-                    var object;
+                    var object,
+                        originalValue = value;
 
                     if (value in exports) {
                         object = exports[value];
@@ -874,6 +869,9 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
                     if (parent) {
                         parent[key] = object;
                     }
+                    if (typeof object === "undefined") {
+                        logger.error("Missing object in serialization: '" + originalValue + "'" + (self._origin ? " in " + self._origin : ""));
+                    }
                     return value;
                     break;