various snag fixes
Merge branch 'release4'

Conflicts:
	src/main/resources/files/app/templates/t3/t3.html
Merge branch 'master' of github.com:ONSdigital/tredegar