John Firebaugh 44629832dd Merge branch 'master' into redesign ... Conflicts: vendor/assets/leaflet/leaflet.hash.js vendor/assets/leaflet/leaflet.js		2013-11-19 09:42:47 -08:00
..
embed.html.erb	Update to Leaflet 0.7	2013-11-18 17:43:46 +00:00