Updates.
Merge branch 'master' of https://github.com/aaltodsg/instans

Conflicts:
	tests/input/CEP2SPARQL/convertcfevents.sh
	tests/input/CEP2SPARQL/data/i5sensors10000events.ttl