Consistency on Contact Us and Error pages with ONS colours
Merge branch 'master' of https://github.com/ONSdigital/tredegar

Conflicts:
	src/main/resources/files/ui/css/main.css