Extra functionalities in Context.
Merge branch 'master' of github.com:NilsCorver/kd118-lib

Conflicts:
	Context.php
Fixed a merge problem.