after first start
integrated JPA entites
Merge branch 'master' of https://github.com/ninomllr/projectoss

Conflicts:
	ch.bfh.kepler.domain/.settings/org.eclipse.jdt.core.prefs
	ch.bfh.kepler.domain/pom.xml