Merge origin/master

Conflicts:
	nbproject/project.properties
	src/java/hibernate.cfg.xml