See yeoman/generator-webapp#137
Merge pull request #1 from jouz/patch-1

See yeoman/generator-webapp#137
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
Merge pull request #11 from hariadi/master

Update yeoman generator.