modify menu and setup.js
add restaurant page
Merge branch 'development' of https://github.com/danuzclaudes/HeelFoodie into development
Merge branch 'development' of https://github.com/danuzclaudes/HeelFoodie into development
Merge branch 'master' of https://github.com/danuzclaudes/HeelFoodie into development
merge template to Restaurant main page
modify Rmain
modified Rmain final V1
add shoppingCart
test for push
Merge remote-tracking branch 'origin/RestaurantDevelopment' into test
After Merge Test and RestaurantDevelopment
Merge branch 'RestaurantDevelopment' into development
Merge branch 'development' into test

Conflicts:
	css/gmap.css
Merge branch 'test' into development