Merge origin/master

Conflicts:
	TeamorientiereteSE/index.php
Merge origin/master

Conflicts:
	TeamorientiereteSE/index.php