Bug fixes in Android
Merge branch 'develop' of https://github.com/bregell/server into develop