player + doc + musique
Merge branch 'master' of https://github.com/Alexiscap/slyset

Conflicts:
	application/views/musique/player.php