init
mergeMerge branch 'master' of https://github.com/authentic4269/AndroidClient