Comit servico avaliador
Merge branch 'master' of github.com:xrogix/projeto

Conflicts:
	protected/controllers/ServicoAvaliadorController.php
	protected/runtime/application.log
avaliador