kneipenservice
a
Merge branch 'master' of https://github.com/thju1011/KneipenApp.git

Conflicts:
	bin/classes.dex
	bin/resources.ap_
gitignore
delete drawable-mdpi/ic_launcher
Merge branch 'master' of https://github.com/thju1011/KneipenApp.git