Clean up merged css
Merge branch 'master' of github.com:ONSdigital/tredegar into spark-line
Filter functionality on search results and fix on navigation
Conflig resolution
Merge branch 'master' of github.com:ONSdigital/tredegar into spark-line
new t3 static html, to merge with ad sparklines story
Merge branch 'master' of github.com:ONSdigital/tredegar
Merge branch 'master' of github.com:ONSdigital/tredegar into spark-line
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
Merge branch 'master' of github.com:ONSdigital/tredegar into spark-line
various spark line layout changes