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

Conflicts:
	geocentralis/settings.py