added jshint to build and fixed jshint errors #2
Merge remote-tracking branch 'origin/master'