Upgraded to library-grunt 0.4.0
Merge branch 'master' of https://github.com/SpringRoll/SpringRoll

Conflicts:
	Gruntfile.js
	package.json