project moved
Merge remote-tracking branch 'origin/yeoman' into yeoman

Conflicts:
	README.md