.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/Persistence/HibernateUtil.java
	src/test/java/Test.java