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

Conflicts:
	application/config/constants.php
	application/controllers/mc_musique.php