diet and restaurant association
Merge branch 'diet-model' into develop

Conflicts:
	spec/controllers/restaurants_controller_spec.rb
	spec/models/restaurant_spec.rb
geolocation on request
Merge branch 'geolocal' of https://github.com/rubenkostucki/nomnivor into develop
Merge branch 'develop'