Stufff
Merge pull request #991 from balabhv/vb548

Various housekeeping and bug fixes to the Android apps.