Merge branch 'develop' of https://github.com/rubenkostucki/nomnivor into develop
adding street areas to eatery names
resturant search based on current view location
Merge branch 'develop' of https://github.com/rubenkostucki/nomnivor into develop
removal of location searches controller spec
Merge branch 'develop' into foursquare

Conflicts:
	app/assets/javascripts/map.js
Merge branch 'master' into develop