maven
Merge branch 'master' of https://github.com/GaysOfNewLife/makejournal-website