Merge branch 'development-raihan'
cleanup
function fix
update login
top search area fix
updated list display for UHC
Merge branch 'development'