Fixed working version of android app.
Merge branch 'master' of github.com:callista-software/netcare-healthplan