update player + update finition générale
Merge branch 'master' of https://github.com/Alexiscap/slyset

Conflicts:
	application/views/achat/melo_achats.php