manque finition photo et doc sinon: all ok
Merge branch 'master' of https://github.com/Alexiscap/slyset

Conflicts:
	application/controllers/melo_achats.php