Update
Merge branch 'master' of github.com:soohei/grunt-requirejs-template

Conflicts:
	README.md
	www/Gruntfile.coffee