Merge Android app into master