Bug fix
Merge branch 'android-devel' of https://github.com/bregell/server into android-devel