Gruntfile cleanup
Merge branch 'master' into release
new build
release 0.9.97