Fixed a bug that was causing Hibernate errors
Merge branch 'master' into devel
Fixed a bug that was causing Hibernate errors