Merge branch 'master' of https://github.com/FlorentinDUBOIS/limonade

Conflicts:
	controllers/app/documents.ctrl.php