AndroidManifest back :)
Merge branch 'master' of https://github.com/meety/meety-android-client