adicionado o gerar
Merge branch 'master' of https://github.com/wendelad/SADisWeb

Conflicts:
	Site/admin/solicitacoes/alterar.php
	Site/gerar.php
Adicionado o php básico para conversão de caracteres bugados, reparem no header
Merge branch 'master' of https://github.com/wendelad/SADisWeb