Users will now authenticate against abakus.no
Merge branch 'master' into abakus_auth

Conflicts:
	fagkom/settings.py
Split settings
Merge pull request #9 from hfalk/abakus_auth

Abakus auth