Some Changes Made on user
Merge branch 'master' of https://github.com/MichaelKambenga/ihfr_curation

Conflicts:
	protected/views/user/admin.php
Some Changes on user table