add grunt jshint task
Merge branch 'dev'