Updated Gruntfile
Merge origin/master