Configuração do acesso
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/conn.php