upgrade grunt jshint and enable force
Merge remote-tracking branch 'origin/master' into cal-annotations