Added a draft for the server module and minor changes to the Android client