js update
Merge origin/master

Conflicts:
	resultats.php