Added context class
merge
Merge branch 'develop' of https://github.com/Westpic/Solap4py into develop

Conflicts:
	src/core/Solap4py.java