Merge branch 'master' of https://github.com/jkamcc/magazine-spring

Conflicts:
	service/src/main/resources/hibernate.xml
fixing tests for windows, and hibernate configuration
hibernate configuration