android manifest
Merge branch 'master' of https://github.com/thju1011/KneipenApp.git

Conflicts:
	AndroidManifest.xml