user controller
Merge branch 'master' of https://github.com/irenemrisho/UDIHIS
admin and hr management
resolved conflict in usercontroller