Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

1 files changed, 10 insertions, 0 deletions

diff --git a/js/components/ui/file-input.reel/file-input.js b/js/components/ui/file-input.reel/file-input.js
index 584380ec..adec6d84 100755
--- a/js/components/ui/file-input.reel/file-input.js
+++ b/js/components/ui/file-input.reel/file-input.js
@@ -9,6 +9,16 @@ var Montage = require("montage/core/core").Montage,
 
 var FileInput = exports.FileInput = Montage.create(Component, {
 
+    inputField: {
+        value: null,
+        serializable: true
+    },
+
+    filePathField: {
+        value: null,
+        serializable: true
+    },
+
     _filePath: {
         enumerable: false,
         value: ""