administrate menus
Merge branch 'master' into inwoods