Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes

Conflicts:
	js/panels/properties.reel/sections/position-size.reel/position-size.html

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.js b/node_modules/montage/ui/popup/notifier.reel/notifier.js
index ac3dcff9..c0878e65 100755
--- a/node_modules/montage/ui/popup/notifier.reel/notifier.js
+++ b/node_modules/montage/ui/popup/notifier.reel/notifier.js
@@ -20,9 +20,11 @@ var Popup = require("ui/popup/popup.reel").Popup;
  */
 
 var Notifier = exports.Notifier = Montage.create(Component, /** @lends module:"montage/ui/popup/notifier.reel".Notifier# */ {
-    hasTemplate: {value: true},
 
-    _msgEl: {value: null},
+    _msgEl: {
+        value: null,
+        serializable: true
+    },
 /**
   Description TODO
   @private