Merge branches 'develop' and 'master' of https://github.com/dubdabasoduba/KeHIS-Android-Client into develop
Merge branch 'master' of https://github.com/dubdabasoduba/KeHIS-Android-Client into develop
Merge pull request #1 from dubdabasoduba/develop

merge