Merge origin/master

Conflicts:
	site/resultado.php
Merge origin/master
Merge origin/master

Conflicts:
	site/resultado.php
Merge origin/master