atualização
Merge remote-tracking branch 'origin/Humberto'

Conflicts:
	application/models/administrador_model.php
	nbproject/project.properties
	nbproject/project.xml
Merge remote-tracking branch 'origin/master' into Felipe
comit_23_02_13
config
Merge remote-tracking branch 'origin/Felipe'
Merge remote-tracking branch 'origin/master' into marcos
Merge remote-tracking branch 'origin/marcos' into marcos

Conflicts:
	application/views/instrutores/manutencao.php
Merge remote-tracking branch 'origin/marcos'
Merge remote-tracking branch 'origin/master' into Felipe
Merge remote-tracking branch 'origin/Felipe' into Humberto