update controller
update menu/index.liquid
merge master