Reworking of Hibernate stuff and libraries - no actual code changes as such