fixed previous conflict
Merge branch 'develop' of https://github.com/alex-heritier/web-app into develop