Merge branches 'Olivier' and 'master' of https://github.com/kanneresed/Site-Web-Action-Velo

Conflicts: