Added Spring + Hibernate + Maikos fix
Merge hub/master