Merge branch 'master' into redesign

Conflicts:
	vendor/assets/leaflet/leaflet.hash.js
	vendor/assets/leaflet/leaflet.js

diff --cc Vendorfile
Simple merge

diff --cc app/controllers/application_controller.rb
Simple merge

diff --cc app/views/layouts/_head.html.erb
Simple merge

diff --cc vendor/assets/leaflet/leaflet.js
index 0f0b01be2a587f901b9464cce071d2cc191529ba,fa26f6e2c6f4902dd5ea73b85aea4fea81259455..2b66295fc11d550ff12ac9f474b6684a0b635689
--- 1/vendor/assets/leaflet/leaflet.js
--- 2/vendor/assets/leaflet/leaflet.js
+++ b/vendor/assets/leaflet/leaflet.js
@@@ -8914,4 -9188,4 +9188,4 @@@ L.Map.include(
  });
  
  
--}(window, document));
++}(window, document));