Merge Android Client

Theme Design