updated android app
Merge pull request #52 from elcabong/Dev

updated android app