Delete add_friends.php
Merge branch 'master' of https://github.com/MaximePlancke/Objectifs

Conflicts:
	user/add_friends.php
Merge branch 'opti/organisation' of https://github.com/MaximePlancke/Objectifs into opti/organisation

Conflicts:
	user/add_friends.php