Fix bug #960
Merge branch 'master' into bug-960

Conflicts:
	app/assets/stylesheets/components/editorial/_add-action.scss
Merge pull request #199 from moneyadviceservice/bug-960

Fix bug #960