Doku Update Sophie
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dokumentation/Semesterprojekt_Doku_SS2014.pdf
	Dokumentation/src/content/hardware.tex