Add Film awards controller and templates for Formstack
Rename Formstack templates to match
Separate Formstack switch for Ethical awards and Film awards
Use monocolumn wrapper on Formstack forms
Merge remote-tracking branch 'origin/master' into film-awards
Update switches for new Formstack sites
Merge branch 'master' into film-awards
clarify that nginx setup is optional
Added sellByDate to Film Awards switches.
remove redundant mapping
Merge pull request #2747 from guardian/remove-redundant-mapping

Remove redundant mapping
Merge pull request #2692 from guardian/film-awards

Film awards
added Discussion
Merge pull request #2745 from guardian/identity-readme-clarification

clarify that nginx setup is optional
Fixed Masterclass url.
Corrected Masterclass component typo
Fix merfge conflicts