Merge origin/master

Conflicts:
	examen.php