file modified version 2 branche options_membres
Merge branch 'options_membres'

Conflicts:
	gwt-moov/file