Merge branch 'master' of github.com:yeoman/generator-webapp

Conflicts:
	readme.md
Merge branch 'master' of github.com:robinpokorny/generator-lessapp

Conflicts:
	readme.md