atualização
Merge remote-tracking branch 'origin/master' into Felipe

Conflicts:
	application/views/header.php
Merge remote-tracking branch 'origin/Felipe'