Add Android app
Updated Android App
Merge remote-tracking branch 'upstream/master'