prepare merge pom
Merge branch 'master' of https://github.com/Thomsen/cornucopia
Merge branch 'master' of https://github.com/Thomsen/cornucopia