cambio de Botones
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/catalogo/2.php
	App/catalogo/81.php
	App/frmIndex.php
	css/pantallabase.css