bla
Merge branch 'master' of https://github.com/neniman/unimon.git

Conflicts:
	bin/UnimonApp.apk
	bin/resources.ap_
	res/layout/activity_main.xml
iconmenue kleiner