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/bytes-converter.js b/node_modules/montage/core/converter/bytes-converter.js
index 1626f352..605d8546 100755
--- a/node_modules/montage/core/converter/bytes-converter.js
+++ b/node_modules/montage/core/converter/bytes-converter.js
@@ -78,7 +78,8 @@ exports.BytesConverter = Montage.create(Converter, /** @lends module:montage/cor
      @default {Number} 2
      */
     decimals: {
-        value: 2
+        value: 2,
+        serializable: true
     },
     /**
      Converts the specified value to byte format.