combos ubicaciones
Merge branch 'master' of https://github.com/exprezzo/triples

Conflicts:
	sistema/presentacion/html.php/receptores/edicion.php
	sistema/presentacion/html.php/rfcs/edicion.php