Add Gruntfile.js for running jshint and test
Fix jshint error
Minor changes
Merge branch 'develop'