Merge branch 'develop'
Merge branch 'develop'
Add gruntfile with jshint task
Merge branch 'develop'
Merge branch 'develop'
Fix jshint files in gruntfile
Merge branch 'master' into develop