Zonk-Funktionalität.
Merge branch 'master' of https://github.com/MuPiehl/Hypo-Caching

Conflicts:
	res/layout/activity_quiz.xml
	src/de/vergleich/fedex/hypo_caching/QuizActivity.java