almost there
spring and hibernate work in test
Merge branch 'database1'
rest and servlet working!
Conflicts:
	src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml