first commit where it's really working: hibernate/spring/ ui not yet
Merge branch 'master' of https://github.com/hubuntub/zenit

Conflicts:
	.gitignore
	pom.xml