Bugfix
BugfixMerge branch 'master' of github.com:Bagception/BagceptionMasterControlService

Conflicts:
	src/de/uniulm/bagception/bagceptionmastercontrolserver/logic/ContextInterpreter.java
Bugfix Wizard
Merge branch 'master' of github.com:Bagception/BagceptionMasterControlService