Android app 
version 2.2
Merge https://github.com/datateller/androidapp