New UI
Merge branch 'master' of https://github.com/marlin-gingerich/kluster-android

Conflicts:
	Kluster/.classpath