Merge origin/master

Conflicts:
	application/controllers/categoria.php
	application/controllers/setor.php
	application/controllers/tiposolicitacao.php
	application/models/categoriamod.php
	application/models/prioridademod.php
	application/models/ticket_atendimentomod.php
	application/models/ticketmod.php
	application/models/tipoticketmod.php
	application/views/chamado/cadastrar.php
	application/views/chamado/editar.php
Merge origin/master

Conflicts:
	application/controllers/categoria.php
	application/controllers/setor.php
	application/controllers/tiposolicitacao.php
	application/models/categoriamod.php
	application/models/prioridademod.php
	application/models/ticket_atendimentomod.php
	application/models/ticketmod.php
	application/models/tipoticketmod.php
	application/views/chamado/cadastrar.php
	application/views/chamado/editar.php