Hibernate putos
Merge origin/master