Update package.json
Updated to support Generator v2
Update README.md
Update README.md
Merge remote-tracking branch 'krcha/master'

Conflicts:
	package.json