Get back androidmanifest xml
Merge branch 'master' of https://github.com/wehkamp/PhotoView