Update Gruntfile.js
Merge remote-tracking branch 'upstream/master' into go_backend
Add lintspaces within Grunt