preparing model, Hibernate hbm2ddl etc .... To Be Continued
Merge branch 'persistence-layer'

Conflicts:
	.settings/org.eclipse.wst.common.component
	pom.xml