Add relationships btw Market and FoodProduct
merge schema.rb
Merge branch 'master' of https://github.com/grubbio/grubbio-web
Merge branch 'master' of https://github.com/grubbio/grubbio-web

psfgecially if it merges an updated upstream into a topic branch.
Merge