rendre
Merge branch 'master' of github.com:samszo/livre-postnum

Conflicts:
	application/controllers/TrombinoscopeController.php