fix gruntfile
Merge branch 'master' into 47-scroll-triggers