Fixed #540
Fixed FAdmin privs not loading correctly
Merge branch 'master' into refactor