Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/io/system/ninjalibrary.json

2 files changed, 3 insertions, 3 deletions

diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index f428a229..ae249480 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -393,12 +393,12 @@ exports.CoreIoApi = Montage.create(Component, {
                         xhr = new XMLHttpRequest();
                     //
                     xhr.open("POST", serviceURL, false);
-                    xhr.responseType = "arraybuffer"; 
+                    //xhr.responseType = "arraybuffer"; 
                     if(file.contentType && file.contentType.length)
                         xhr.setRequestHeader("Content-Type", file.contentType);
                     else
                         xhr.setRequestHeader("Content-Type", "text/plain");
-
+                    
                     if (file.contents)
                         xhr.send(file.contents);
                     else
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index a863a135..29df45b8 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
-                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.6.0.0"},
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.7.0.0"},
                 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.1.2"}
         ]
 }
\ No newline at end of file