registro
Merge branch 'master' of https://github.com/jpacora/Plataforma-Comercial

Conflicts:
	system/templates/cuenta/registro.template.php