removed extra comma in gruntfile.js
Merge branch 'master' into demo