diets rendering on markers
Merge branch 'filter-diets' into develop

Conflicts:
	app/assets/javascripts/map.js
	app/models/restaurant.rb
create foursquare.js file