Init
Change README
Merge branch 'master' of https://github.com/jorrete/generator-webapp-custom

Conflicts:
	README.md