Merge remote-tracking branch 'origin/master'

Conflicts:
	sensorstream-core/src/main/java/cgl/sensorstream/core/kafka/KafkaBoltBuilder.java