API mostly done
Merge branch 'pablos-changes' of https://github.com/FoodCircles/food_circles into pablos-changes