dogfooding from generator-projectfiles
Merge branch 'master' of github.com:codeinchaos/restful-zend-framework

Conflicts:
	README.md