Configuracao do DB
Merge remote-tracking branch 'origin/master'

Conflicts:
	instalacao/config-dist.php