prepare to code...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dispatcherMonitor/Dispatcher.java
	src/komponentenFassaden/AngebotsverwaltungFassade.java
	src/typClasses/AngebotTyp.java
	src/typClasses/AuftragTyp.java