checkboxes showing
finish diet association with checkboxes
refactorings
develop stuff
resolved conflicts
added ajax request for restaurants
clean up the create_diets method
finished
changed box size
Merge branch 'develop' of github.com:rubenkostucki/nomnivor into develop
hide button
Merge branch 'develop' of github.com:rubenkostucki/nomnivor into develop

Conflicts:
	app/views/map/_action_call.html.erb
close buttons
no change
fix checkbox rendering
Merge branch 'diet-checkboxes' into develop
Merge branch 'javascript_icons' into develop

Conflicts:
	app/assets/stylesheets/map.css
	app/controllers/restaurants_controller.rb
	app/models/restaurant.rb
	app/views/map/_action_call.html.erb
	app/views/restaurants/_diets.html.erb
	spec/controllers/restaurants_controller_spec.rb