ajustes
ajustes
Merge branch 'Develop' of github.com:hugomarin/artBO into Develop

Conflicts:
	view/inc-galeria-1.php
	view/inc-stand-1.php
	view/registro-documentos-0460.php