adding changes
Merge branch 'master' of https://github.com/supunkamburugamuva/sensorstream

Conflicts:
	sensorstream-core/src/main/java/cgl/sensorstream/core/SensorListener.java