Merge branch 'master' into pentool

Conflicts:
	manifest.json

1 files changed, 2 insertions, 2 deletions

diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index d2e82662..a4656bb5 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -63,8 +63,8 @@ exports.CloudPopup = Montage.create(Component, {
         enumerable: false,
         value: function() {
                 //
-                if (window.localStorage['ioRootUrl']) {
-                        this.components.url.value = window.localStorage['ioRootUrl'];
+            if (this.application.localStorage.getItem("ioRootUrl")) {
+                this.components.url.value = this.application.localStorage.getItem("ioRootUrl");
                 }
                 //
                 this.testConnection();