jpa annotation fix for glassfish and clean up
Merge branch 'master' of https://github.com/justas-eu/geoip