Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Projektdokumente/20140901_Projektdokumentation.docx