Annotation cleanup
Merge branch 'master' of https://github.com/EinWesen/poissf-jdbc-bridge.git