Merge branch 'develop' of https://github.com/nicodel/Run-Bike-Hike into develop
remise a plat
Merge branch 'master' into gh-pages