reverse Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into master-cm