fixed manageusermenu
Merge origin/master