remaining entity classes added, previous fixed

	cardinality and reference mapping corrected
	entities should work.

	STATUS: NON-STABLE COMMIT

	Commit by: Simon, Robert, Thomas, Christopher, Kasper