Update menu.xml
Merge branch 'master' into BETA