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, 2 insertions, 1 deletions

diff --git a/node_modules/montage/core/converter/converter.js b/node_modules/montage/core/converter/converter.js
index a23d2702..97e1a5f2 100755
--- a/node_modules/montage/core/converter/converter.js
+++ b/node_modules/montage/core/converter/converter.js
@@ -111,7 +111,8 @@ var Converter = exports.Converter = Montage.create(Montage, /** @lends module:mo
      @default {Boolean} true
      */
     allowPartialConversion: {
-        value: true
+        value: true,
+        serializable: true
     },
 
     /**