lol
Merge branch 'master' of github.com:Nitix/projet-tuteure

Conflicts:
	View/ListDocumentsAdminView.php
Merge branch 'master' of github.com:Nitix/projet-tuteure