Merge branch 'refs/heads/master' into binding

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/js/document/helpers/url-parser.js b/js/document/helpers/url-parser.js
index 5e71d148..7bded27d 100755
--- a/js/document/helpers/url-parser.js
+++ b/js/document/helpers/url-parser.js
@@ -53,7 +53,7 @@ exports.UrlParser = Montage.create(Component, {
                 //Getting file URI (not URL since we must load through I/O API)
                         var css = {}, file;
                         css.cssUrl =  href.split(this.application.ninja.coreIoApi.rootUrl)[1];
-                        css.fileUri = this.application.ninja.coreIoApi.cloudData.root + css.cssUrl;
+                        css.fileUri = this.application.ninja.coreIoApi.cloudData.root + unescape(css.cssUrl);
                         //Loading data from CSS file
                         file = this.application.ninja.coreIoApi.readFile({uri: css.fileUri});
                         //Checking for file to be writable on disk