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/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: {