Bug fixes on android client and webserver