Merge branch 'staging' of github.com:finleyltf/FusionSquare into staging
Merge branch '2-reservation' of github.com:finleyltf/FusionSquare into staging

merge
style for menu
add icons , gogole map
remove conflct
Merge branch '2-reservation' of github.com:finleyltf/FusionSquare into staging

merge
navi icon fix/ googlemaps scroll disable
Merge branch 'staging' of github.com:finleyltf/FusionSquare into staging
css change
Merge branch 'staging' of github.com:finleyltf/FusionSquare into staging

mergeÂ
navi icon fix
fix
Merge branch 'staging' of github.com:finleyltf/FusionSquare into staging

merge
logo fix
Merge branch 'staging' of github.com:finleyltf/FusionSquare into staging
conflict fix
buffetAdmin fix, buffet tab init
fix menulist url
reformat css
add function for remove single product and all products in shopping cart