Records touch parents
Remove not used files
Merge remote-tracking branch 'origin/master' into CRUD_restaurant

Conflicts:
	Gemfile.lock
	config/routes.rb
Merge remote-tracking branch 'origin/master' into CRUD_restaurant

Conflicts:
	Gemfile.lock
	config/routes.rb
Merge branch 'angular-poll' into caching
Add caching to Poll.as_json
Force poll to reload after vote save
Comment
Merge branch 'master' into caching
Use script tag directly for modernize
Remove extensions of imports in application.css.scss
Modif pour PR
encore a faire : mod box shadow avec compass
Merge remote-tracking branch 'origin/master' into GeoLocation_Gmaps

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/restaurants.js.coffee
	app/views/layouts/application.html.erb
	app/views/restaurants/_form.html.erb
	app/views/restaurants/show.html.erb
Merge branch 'master' into fix-prod
Merge branch 'master' into caching

Conflicts:
	app/controllers/polls_controller.rb
	app/models/choice.rb
	app/models/participant.rb
	app/models/poll.rb
Merge pull request #23 from mllm/fix-prod

Corrige une erreur en production
Merge remote-tracking branch 'origin/master' into GeoLocation_Gmaps

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	app/views/restaurants/show.html.erb
	db/schema.rb
Merge pull request #21 from mllm/GeoLocation_Gmaps

Geo location gmaps
fixed typo in test name
Merge pull request #25 from mllm/fix_test

Fix test