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

Conflicts:
	alfheimweb/tests.py
maj
maj
Merge branch 'master' of https://github.com/appert44/Alfheim