Merge branch 'master' of

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

Conflicts:
	src/de/tudarmstadt/maki/simonstrator/api/component/mape/DecisionContainer.java
	src/de/tudarmstadt/maki/simonstrator/api/component/mape/decision/DecisionComponent.java