minor changes
Merge origin/master
merge
Merge origin/master
top menu depending on role displayed