Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

Conflicts:
	js/stage/binding-view.reel/binding-view.js

1 files changed, 4 insertions, 2 deletions

diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index bc433f52..29f49b7b 100755
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -20,7 +20,8 @@ exports.Combobox = Montage.create(Component, {
     },
 
     labelField: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     labelFunction: {
@@ -28,7 +29,8 @@ exports.Combobox = Montage.create(Component, {
     },
 
     dataField: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     dataFunction: {