Uninportant cosmetic maven/idea stuff
Remove unused catalog
Merge branch 'master' of github.com:killbill/killbill