test
test
Merge branch 'master' of https://github.com/ollidiemaus/px01.git

Conflicts:
	src/de/gggames/bechern/MainActivity.java