use Grunt to build files
Merge branch 'master' into contain