Merge branch 'master' of https://github.com/axelw/project-template-support

Conflicts:
	README.md
Merge branch 'master' of https://github.com/axelw/project-template-support