Updated to new layout
Combine website and single-sign-on api into one instance.
Update to work with latest selvbetjening
Add email management interface
.
.
.
Fixed depricated call in hashlib.md5
Remove intranet link
Update report
Correct default setting
Remove incorrect link
Merge branch 'master' of github.com:animekita/selvbetjening-kita
Update navigation
Merge branch 'tmp' into production

Conflicts:
	kita_website/apps/kitamembership/models.py
	kita_website/apps/vanillaforum/models.py