Merge pull request #1 from enplotz/datamodel

Data model typo
Merge remote-tracking branch 'refs/remotes/Manu/master'
Merge remote-tracking branch 'refs/remotes/Manu/master'
fine tuning
Merge remote-tracking branch 'refs/remotes/Manu/master'

Conflicts:
	presentation/include/01_general.tex
Merge pull request #5 from MarcSpicker/master

Fine tuning..