android app
Merge pull request #2 from chinavatar/master

android app