Fix JS linting
Merge branch 'master' into jshint
Merge pull request #562 from 28msec/jshint

Fix JS linting