maven stuff
Merge branch 'develop' of github.com:makkus/cjwizard into develop