Merge origin/master

Conflicts:
	maven-spring-hibernate/src/main/resources/hibernate.cfg.xml