Bugfix2
Merge branch '1.X-EXPERIMENTAL' of https://github.com/JustArchi/ArchiDroid into 1.X-EXPERIMENTAL
Bunch of updates