Fixed FAdmin kicking from the menu
Merge branch 'master' into refactor