ModelObject
Merge branch 'master' of https://github.com/vdemotz/IntroDBProject

Conflicts:
	src/ch/ethz/inf/dbproject/model/ModelObject.java