Clean up merged css
Filter functionality on search results and fix on navigation
Conflig resolution
new t3 static html, to merge with ad sparklines story
Merge branch 'master' of github.com:ONSdigital/tredegar
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
Consistency solved in error pages and contact us
Update from Rob with CSV value multiplier included.
introduced 5 column grid for new hompage
Merge branch 'master' of github.com:ONSdigital/tredegar
T2 section description text lists titles on the level below
Merge branch 'master' of github.com:ONSdigital/tredegar
Taxonomy update with the latest spreadsheet update from Rob.
Merge branch 'master' of github.com:ONSdigital/tredegar
Taxonomy generator changes
Added units in T5 Tooltip
Merge branch 'master' of https://github.com/ONSdigital/tredegar
Fixed character encidong issue on search results page, limited search result content description to 300 characters
Merge branch 'master' of github.com:ONSdigital/tredegar