misc
Merge branch 'master' of https://github.com/ArchiDroid/ArchiDroid into i9300-experimental