maj'
Merge branch 'master' of https://github.com/appert44/Alfheim

Conflicts:
	alfheimweb/templates/alfheimweb/main.html
	alfheimweb/views.py
maj'