some changes
Merge branch 'master' of https://github.com/TorbenHaug/SE1

Conflicts:
	Datenmodell.vsdx