Varias Modificaciones
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	ajax/common.inc
	registro.php