Replaced proxy host in JS file
Some more transformation code for JS
Merge branch 'development' into staging
Undoing change by staging branch