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

Conflicts:
	application/views/partition/pi_ajout_livret.php
	application/views/partition/pi_ajout_paroles.php
	assets/javascript/slyset.js