merge web client and android client