resolve merge

CHANGELOG.md

assets/src/scripts/ajax.spec.js

assets/src/scripts/d3-rendering/accessibility.spec.js

assets/src/scripts/d3-rendering/alerts.spec.js

assets/src/scripts/d3-rendering/axes.spec.js

assets/src/scripts/d3-rendering/cursor-slider.spec.js

assets/src/scripts/d3-rendering/data-masks.spec.js

assets/src/scripts/d3-rendering/graph-tooltip.spec.js

assets/src/scripts/d3-rendering/legend.js

assets/src/scripts/d3-rendering/legend.spec.js

assets/src/scripts/d3-rendering/loading-indicator.spec.js

assets/src/scripts/d3-rendering/markers.spec.js

assets/src/scripts/d3-rendering/tick-marks.spec.js

assets/src/scripts/d3-rendering/tooltips.js

assets/src/scripts/d3-rendering/tooltips.spec.js

assets/src/scripts/index.spec.js

assets/src/scripts/leaflet-rendering/legend-control.spec.js

assets/src/scripts/leaflet-rendering/map.spec.js

assets/src/scripts/lib/d3-redux.spec.js

...location/components/daily-value-hydrograph/graph-brush.js