更新
Merge branch 'master' of https://github.com/pandorajs/generator-pandora

Conflicts:
	app/templates/Gruntfile.js
	package.json