Clean up
Merge branch 'master' of https://github.com/bhm/Thrilling-Tales

Conflicts:
	bin/AndroidManifest.xml