WhackAMole start
Merge branch 'master' of https://github.com/MuPiehl/Hypo-Caching

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml