default map to current location if user selects it
Merge branch 'cgdevelop' into 118-hide-return-trip-in-summary-if-empty
Merge branch 'cgdevelop' into 110-default-map-to-current-location
make 'yes' click handler more specific for trips
Merge branch 'cgdevelop' into 110-default-map-to-current-location
Merge branch 'cgdevelop' into 110-default-map-to-current-location
clean up trip js code
ensure map center/zoom and markers are correct for each screen
Merge branch 'cgdevelop' into 110-default-map-to-current-location

Conflicts:
	app/views/trips/_trip_form.html.haml
update stored address
Merge branch 'cgdevelop' into 110-default-map-to-current-location
more leaflet refactoring/centering/zooming fixes
use refactored zoom_to_marker method in trips.js
Merge branch 'cgdevelop' into 110-default-map-to-current-location
For now, use Place of Interest as From Location
Merge branch 'cgdevelop' into 110-default-map-to-current-location
change order of leaflet instructions on trip overview page
more tweaking leaflet map code on Overview page to ensure proper size
Merge branch 'cgdevelop' into 110-default-map-to-current-location
Merge pull request #39 from CG-CamSys/110-default-map-to-current-location

Default map to current location and other map fixes