removed redundant js
Merge remote-tracking branch 'boris_webapp/webapp' into webapp