Add some improvements to the archetype and fix some pom issues
Merge branch 'archetypeimporvements'