ok
Merge branch 'master' of https://github.com/gustavobhweb/izabela_hendrix

Conflicts:
	application/controllers/adm.php
	application/models/solicitacao_model.php
	static/imagens/111111.jpg