tons of changes, subgenerators, documentation.
Merge branch 'origin/master'

Conflicts:
	app/index.js
	package.json
merge conflicts