Merging android client and normal one. Did some touch ups to client