Mattrayner/fix master merge conflicts (#551)
Mattrayner/fix master merge conflicts (#551)

* [WEBSITE-1308] Updates to homepage (#470)

* [RELEASE] Adding image service variables and constituency maps (#520)

* [WEBSITE-1572] Updated environment variables

* Updated geosparql_to_geojson gem

* [WEBSITE-1531] Map integration (#517)

* Stopped passing GeoSparql Point data to geosparql_to_geojson gem since it's not needed

* [RELEASE] Adding image service variables and constituency maps (#520)

* [WEBSITE-1572] Updated environment variables

* Updated geosparql_to_geojson gem

* [WEBSITE-1531] Map integration (#517)

* Stopped passing GeoSparql Point data to geosparql_to_geojson gem since it's not needed

* [WEBSITE-1620] Remove search component from Lords page (#533)

* [RELEASE] Bump of pugin version (#535)

* [WEBSITE-1626] Replaced inner-container-focus (#538)

C-N-J/parliament.uk-prototype,cwaszczuk/parliament.uk-prototype,ukparliament/parliament.uk-prototype,C-N-J/parliament.uk-prototype,vinternet-pds/parliament.uk-prototype,ukparliament/parliament.uk-prototype,ukparliament/parliament.uk-prototype,C-N-J/parliament.uk-prototype,cwaszczuk/parliament.uk-prototype,vinternet-pds/parliament.uk-prototype,vinternet-pds/parliament.uk-prototype,vinternet-pds/parliament.uk-prototype,cwaszczuk/parliament.uk-prototype,ukparliament/parliament.uk-prototype,C-N-J/parliament.uk-prototype,cwaszczuk/parliament.uk-prototype