fix config
Merge branch 'master' of https://github.com/neatpilot/Spring_Hibernate_User

Conflicts:
	src/applicationContext-beans.xml