order page and menu page ready
Merge branch 'master' of https://github.com/zhichunl/MealPlan