Merge branch 'master' of https://github.com/therealstan/DHBW_SE

Conflicts:
	Pflichtenheft/Pflichtenheft.log
	Pflichtenheft/Pflichtenheft.pdf
	Pflichtenheft/Pflichtenheft.synctex.gz