Resolve conflicts
Merge branch 'master' of https://github.com/detourmaps/detourweb
Backup bd postgres
Backup bd postgres
Removed the .pyc files and added a requirements file and a .gitignore (so .pyc and undesirable files do not get commited again)
Added some more packages needed to run the project.
Removing some junk files and fixing some verbose_name that are causing this: https://code.djangoproject.com/ticket/8162 (dumb django bug not yet fixed, avoided using short verbose_name in model meta). The bug was blocking the test suite to be run.
Merge branch 'master' of github.com:detourmaps/detourweb