Closed #107
Clean js files to match jenkins checkstyle
Merge remote-tracking branch 'origin/dev' into dev