updates gruntjs
TEST MERGE... Merge branch 'master' of github.com:lin04com/grunt-compiler

Conflicts:
	Gruntfile.js
AA