conflict fix
buffetAdmin fix, buffet tab init
conflict fix
add paypal
buffet page css
buffet page css/ todo: font
Merge branch '1-buffet-menu' of github.com:finleyltf/FusionSquare into staging

merger