DRan
Merge remote-tracking branch 'origin/master-Schrittzaehler_app' into
master-Schrittzaehler_app

Conflicts:
	Schrittzaehler/bin/Schrittzaehler.apk
	Schrittzaehler/bin/classes.dex
	Schrittzaehler/bin/resources.ap_
	Schrittzaehler/src/ch/ez_gaming/schrittzaehler/MainActivity.java