Modifications needed by the AAL scenario.
Merge remote-tracking branch 'github/master'

Conflicts:
	src/net/xqhs/graphs/context/ContinuousContextMatchingPlatform.java
	src/net/xqhs/graphs/matchingPlatform/GraphMatchingPlatform.java