SMal lfixes
Fixed menus
fixed merge conflicts
fixed commits, bypassing sebbes commit
Commented out stuff in the tests
Merge branch 'Anders' into dev