Merge branch 'refs/heads/master' into AddAnimationsLibrary

Conflicts:
	js/panels/presets/default-transition-presets.js

1 files changed, 6 insertions, 0 deletions

diff --git a/js/io/ui/file-picker/file-picker-model.js b/js/io/ui/file-picker/file-picker-model.js
index 09c3ae9c..c92ec586 100755
--- a/js/io/ui/file-picker/file-picker-model.js
+++ b/js/io/ui/file-picker/file-picker-model.js
@@ -73,6 +73,12 @@ exports.FilePickerModel = (require("montage/core/core").Montage).create(require(
             value:""
         },
 
+        currentLogicalDrive:{
+            writable:true,
+            enumerable:true,
+            value:""
+        },
+
         callback:{
             writable:true,
             enumerable:true,