update sub generator
Merge remote-tracking branch 'origin/master'

Conflicts:
	generators/module/index.js