Merge origin/master

Conflicts:
	registro.php
Merge origin/master

Conflicts:
	registro.php
Merge origin/master

Conflicts:
	main.php