map scaffold file removal
Merge branch 'master' into develop
Merge branch 'master' of https://github.com/rubenkostucki/nomnivor
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop' of https://github.com/rubenkostucki/nomnivor into develop
ajax response works
personal geolocation by user choice finished
adding street areas to eatery names
solved qa issues
resturant search based on current view location
Merge branch 'master' of github.com:rubenkostucki/nomnivor
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
Merge branch 'develop' into filter-diets

Conflicts:
	app/assets/javascripts/map.js
	app/models/restaurant.rb
	app/views/restaurants/_form.html.erb