* Updated GeoIP settings
Merge branch 'develop' of https://github.com/SoloTodo/soloelectro into develop

Conflicts:
	website/settings/defaults.py