arabela
Merge remote-tracking branch 'origin/master'

Conflicts:
	main/incluidos/html/footer.php
	modulos/stencil/consultagen.php
arabela