Fix functional bugs v1
Merge branch 'master' of github.com:arnage/order_lunch
Fix functional bugs v1