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
Merge pull request #6 from danuzclaudes/master

11/09/2014 V2 - index finished
11/09/2014 V2 - index finished
Merge branch 'development' of https://github.com/danuzclaudes/HeelFoodie into development
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
Merge pull request #10 from 54wang17/development

Order Input&Confirm 1st Edition
Merge pull request #12 from danuzclaudes/OrderDevelopment

11/09/2014 V3