Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/document/document-html.js
	js/document/templates/app/main.js
	js/panels/Panel.reel/Panel.js
	node_modules/montage/ui/native-control.js

Signed-off-by: Armen Kesablyan <armen@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