Fix menu options appearing when menu admin is not turned on.
Merge branch 'master' of git@github.com:/AppStateESS/phpwebsite