Merge branch 'master' of https://github.com/dzizes/django-geoportals

Conflicts:
	GeoPortals/middleware.py
	GeoPortals/settings.py
	GeoPortals/urls.py
	Portal/auth_views.py
	Portal/models.py
	Portal/views.py
	requirements.txt
	templates/home.html