Merge remote-tracking branch 'origin' into development
rename order.js to menuorder.js
Merge pull request #12 from danuzclaudes/OrderDevelopment

11/09/2014 V3
Merge pull request #13 from danuzclaudes/master

11/09/2014 V3
address input 2nd
Merge pull request #14 from 54wang17/development

add address input 2nd edition
Merge pull request #15 from danuzclaudes/OrderDevelopment

11/11/2014 Master - OrderDevelopment
Merge pull request #17 from danuzclaudes/master

11/11/2014 Development - Master
Add My Main Page html and css
Merge pull request #18 from 54wang17/development

add my main page
Merge pull request #19 from danuzclaudes/OrderDevelopment

11/12/2014 Master - OrderDevelopment
11/12/2014 V3

editAddress.js complete
remaining Order Tracking page
Merge pull request #21 from danuzclaudes/development

11/12/2014 Master - Development
change html to php
rename and modify
rename MenuOrder.js to Order.js and rename ~HEAD
Merge pull request #22 from danuzclaudes/RestaurantDevelopment

11/15/2014 Master - RestaurantDevelopment
Merge pull request #23 from danuzclaudes/master

11/15/2014 Development - Master
Restaurant mainpage
11/16/2014 V4

revise address complete
remaining tracking page