Ajustes
Ajustes
Merge branch 'master' of github.com:xrogix/projeto

Conflicts:
	protected/controllers/ServicoCandidatoController.php
	protected/models/ViewServicoCandidato.php
	protected/runtime/application.log
	protected/views/servicoGestor/admin.php
	protected/views/servicoGestor/adminCandidato.php