[en cours] afficher doc
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/CDocument.php
afficher doc OK