massive bugfixes
Merge branch 'master' of https://github.com/mStellmann/HES_AIP

Conflicts:
	src/dispatcherMonitor/Dispatcher.java
	src/dispatcherMonitor/Monitor.java
	src/dispatcherMonitor/interfaces/IMonitor.java