First commit
Merge https://github.com/danhipke/android-server