?
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/TheoriepruefungBinnenscheinCH.apk
merging
continue with double click
continue quiz on touch