updated config
updated grunt config
Merge branch 'master' into build
build