Ajuste view searchUBS
Resolvendo conflitos
Merge branch 'master' of https://github.com/CadeMeuHospital/CadeMeuHospital
Ajuste em testTakeCity() da ControllerUserTest