Merge branch 'nr/monitoring' of

ssh://git@dev.kom.e-technik.tu-darmstadt.de/maki/simonstrator-api.git
into nr/monitoring

Conflicts:
	src/de/tudarmstadt/maki/simonstrator/api/component/mape/stateexchange/InfoProviderComponent.java
	src/de/tudarmstadt/maki/simonstrator/api/component/mape/stateexchange/StateExchangeComponent.java