Add Kahuna Integration

This reverts commit c3655b5603424c777ed99a22fa2c430f2846b173.

Conflicts:
	build.gradle