Add custom kicker
Add boolean for custom kicker
Apply kicker boolean
Hide certain options for certain tones
Merge branch 'master' into custom-kicker
Merge branch 'master' into custom-kicker

Conflicts:
	common/app/model/content.scala
	facia-tool/public/js/models/collections/article.js
Middotty
Fix merge conflict
Merge branch 'master' into custom-kicker

Conflicts:
	facia-press/app/frontpress/jsonModels.scala
Merge branch 'master' into facia-tool-tone-defaults
Merge pull request #6229 from guardian/custom-kicker

Add custom kicker
Move non-persisted properties from meta into state
Fox merge conflict
Better function names
Override the margin bottom for live blog thumbnails
Tone labelling style
Alphabetise
Merge pull request #6301 from guardian/live-blog-thumbnail-tweak

Live blog thumbnail tweak
Add weird trim function to minimise whitespace in kickers
Merge pull request #6302 from guardian/whitespace-reduction-in-facia-card-headers

Add weird trim function to minimise whitespace in kickers