merged groovy-ebean and common-ebean, upgraded ebean