fixfix

Conflicts:
	hibernate-samples/src/main/resources/ehcache.xml