Merge origin/master

Conflicts:
	registro.php