Just to make this compile.
Merge branch 'kl-masterclasses' of github.com:guardian/frontend into kl-masterclasses

Conflicts:
	commercial/app/model/commercial/masterclasses/MasterClass.scala