Added UI and changed Android Manifest a bit
Merge branch 'master' of https://github.com/marlin-gingerich/kluster-android

Conflicts:
	Kluster/AndroidManifest.xml
	Kluster/project.properties
	Kluster/res/values/strings.xml