Edito edition
Merge branch 'master' of github.com:faitmain/faitmain.org