Added some menus
Merge branch 'master' into local_menus
test gitignore
Merge branch 'local_menus'