refresh
refresh
Merge branch 'master' of http://github.com/appert44/Alfheim

Conflicts:
	alfheim/settings.pyc
	alfheimweb/urls.pyc
	alfheimweb/views.py
	alfheimweb/views.pyc