Merge remote-tracking branch 'upstream/gx-0.8' into gx-0.8

Conflicts:
	deploy.sh
	pom.xml
	project/Build.scala
Merge branch 'gx-0.8' of github.com:jgbaylon/kafka into jenkins

Conflicts:
	deploy.sh
	pom.xml