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
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 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