Miniscule changes. Flexable user menu
Merge branch 'develop' into feature/Lars
Merge
Merge branch 'feature/Lars' into develop