Merge branch 'master' of github.com:pkom/gesiesweb

Conflicts:
	gesiesweb/core/context_processors.py
	gesiesweb/core/urls.py
	gesiesweb/core/views.py
	gesiesweb/templates/core/profile.html
Fix