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

Conflicts:
	community/admin.pyc
	community/models.pyc
	community/views.pyc
Merge branch 'master' of https://github.com/detourmaps/detourweb
Merge branch 'master' of https://github.com/detourmaps/detourweb
Merge branch 'master' of https://github.com/detourmaps/detourweb
Merge branch 'master' of https://github.com/detourmaps/detourweb

Conflicts:
	community/admin.pyc
	community/models.pyc
	community/urls.pyc
	community/views.pyc
Merge branch 'master' of https://github.com/detourmaps/detourweb

Conflicts:
	community/models.pyc
	community/urls.pyc
	community/views.pyc
Merge branch 'master' of https://github.com/detourmaps/detourweb

Conflicts:
	community/urls.py
Merge branch 'master' of https://github.com/detourmaps/detourweb
Merge branch 'master' of https://github.com/detourmaps/detourweb

Conflicts:
	community/urls.pyc
	community/views.pyc
Merge branch 'master' of https://github.com/detourmaps/detourweb
Merge branch 'master' of https://github.com/detourmaps/detourweb
Merge branch 'master' of https://github.com/detourmaps/detourweb

Conflicts:
	community/urls.pyc
	community/views.pyc
	web/views.pyc
Merge branch 'master' of https://github.com/detourmaps/detourweb

Conflicts:
	community/views.pyc
Merge branch 'master' of https://github.com/detourmaps/detourweb

Conflicts:
	community/admin.pyc
	community/models.pyc
	community/urls.pyc
	community/views.pyc
	web/views.pyc