user
Merge branch 'master' of https://github.com/Rayvexx/Projet_annuel into Adrien
Merge branch 'master' of https://github.com/Rayvexx/Projet_annuel into Adrien

Conflicts:
	_v2/lib/param.php
Merge pull request #84 from Rayvexx/Adrien

Adrien