Resolução conflitos
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/EstimarCustoController.php
	application/models/FuncaoDados.php
	application/models/PontosFuncao.php