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/dynamic-text.reel/dynamic-text.js b/node_modules/montage/ui/dynamic-text.reel/dynamic-text.js
index 8562fdae..c10d63b5 100755
--- a/node_modules/montage/ui/dynamic-text.reel/dynamic-text.js
+++ b/node_modules/montage/ui/dynamic-text.reel/dynamic-text.js
@@ -49,7 +49,8 @@ exports.DynamicText = Montage.create(Component, /** @lends module:"montage/ui/dy
         @default null
     */
     converter: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     /**
@@ -58,7 +59,8 @@ exports.DynamicText = Montage.create(Component, /** @lends module:"montage/ui/dy
         @default {String} ""
     */
     defaultValue: {
-        value: ""
+        value: "",
+        serializable: true
     },
 
     _valueNode: {