An Demands weitergearbeitet.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	SCSIMSIM.v12.suo
	SCSIMSIM/Model/src/Entities/ArticleTypes.cs