Merge origin/master

Conflicts:
	src/java/hibernate.cfg.xml