Added more admin controls
Merge branch 'master' of github.com:haugene/fagdagen