Merge origin/master

Conflicts:
	Passerelle/pdoForme.php
Merge origin/master

Conflicts:
	Passerelle/pdoForme.php
Merge origin/master

Conflicts:
	Passerelle/pdoLangue.php