description pres jquery
Merge remote-tracking branch 'origin/master'

Conflicts:
	projet_conf/server/controler.php