Olivier Girardot -> Florent Biville
Merge pull request #1 from xebia-france/florent-biville

Olivier Girardot -> Florent Biville
Merge branch 'master' into gh-pages