Fix trailblock refresh logic
Refactor. v0 of headline override.
Add ability to update contentApi, min and max on a block
Fix refresh. Add common.js
Merge remote-tracking branch 'origin/fronts-trail-meta' into fronts-trail-meta
Change min and max to Ints
Use defaults
Tidy(ish)
Merge branch 'fronts-trail-meta' of github.com:guardian/frontend into fronts-trail-meta
Max trails defaults to 20
Merge branch 'master' into fronts-trail-meta

Conflicts:
	admin/app/views/fronts.scala.html
	admin/public/css/style.css
Remove tweak saving
Merge branch 'master' into fronts-trail-meta

Conflicts:
	admin/app/controllers/FrontsController.scala
	admin/app/model/frontsapi.scala