Updating adaptation
Merge branch 'develop' of https://github.com/CMRC/climate-ireland into develop

Conflicts:
	src/clad/views/CI_adaptation.html
Commit to pull
Merge branch 'develop' of https://github.com/CMRC/climate-ireland into develop
Updated spans for internal refs and adaptation section (Adaptation and uncertainty tab now included)