Merge origin/master

Conflicts:
	Vue/vueGauche.inc.php
Merge origin/master

Conflicts:
	Vue/vueGauche.inc.php
Merge origin/master

Conflicts:
	Vue/vueGauche.inc.php
Merge origin/master