Removed unnecessary hardcoded js urls.
Merge branch 'master' into file-browser
Merge branch 'master' into file-browser