Admin og bruker menyer
Token fix (BASE class)
test
Merge remote-tracking branch 'origin/master'