updated menu
Merge branch 'develop' into gh-pages
compiled