jshint integrated as part of grunt build task
Merge remote-tracking branch 'origin/master'