new changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/io/hybrid/interaction/dollar/kernalfunction.cl