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

Conflicts:
	portal/temas/default/vistas/receptores/edicion.php
Merge branch 'master' of https://github.com/exprezzo/triples