admin
Merge branch 'master' of https://github.com/evimbec-ltee/geocentralis

Conflicts:
	geocentralis/modules/admin/views.py
	geocentralis/urls.py