update player
Merge branch 'master' of github.com:Alexiscap/slyset

Conflicts:
	application/models/musique_model.php