Merge origin/master

Conflicts:
	autorizar_transaccion.php
	formulario_registro.php
	main.php
	registro.php
Merge origin/master

Conflicts:
	upload.php