corrected url restriction in js
Merge branch 'dev' into servlet2