Mle : menage
Merge branch 'master' of https://github.com/a4p/gh_cdev

Conflicts:
	www/partials/meeting/Meeting_linked_object.html