Housekeeping
Merge branch 'master' of https://github.com/genthaler/maven-archetype-ant-plugin

Conflicts:
	.gitignore