Merge origin/master

Conflicts:
	application/controllers/funcionarios.php
	application/views/funcionarios/forme_novo_funcionario_view.php