update gruntfile and rebuild
:Merge branch 'master' into gh-pages