Merge origin/master

Conflicts:
	TeamorientiereteSE/Info.class.php