fix jshint errors
Merge branch 'master' into feature/new-design