Server and android code added