Merge branch 'dev'
menu and entry footer
Merge pull request #3 from m-e-h/master

update things