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

Conflicts:
	geocentralis/core/admin.py