better waiting message
conflict
Touches finales
Merge branch 'master' of github.com:lemonde/map-monde