Resolve conflicts
Merge branch 'master' of https://github.com/detourmaps/detourweb
Backup bd postgres
Backup bd postgres