update package.json and gruntfile
Merge remote-tracking branch 'origin/master'