Merge origin/master

Conflicts:
	testeProfessores/index.php