Re-ordered Maven properties
Wording
Try to correct #305
Merge branch 'master' of https://github.com/jhipster/generator-jhipster