finish the food and location restfulservice
Merge branch 'develop'