More work on Android.
Merge branch 'dev' of github.com:callista-software/netcare-healthplan into dev