Use independent manifests
Merge branch '2.X-MANIFESTS' of https://github.com/JustArchi/ArchiDroid into 2.X-MANIFESTS