correction controller
Merge branch 'master' of https://github.com/samszo/livre-postnum

Conflicts:
	application/controllers/TrombinoscopeController.php