Merge origin/master

Conflicts:
	src/main/resources/hibernate.cfg.xml