Plein de trucs
Merge branch 'master' of https://github.com/charl0tee/Cocamp

Conflicts:
	ipress/messagerie.php