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
Editionalise the commercial tags
Added IMR and AMAA tags
evert "Switches now have an sell-by-date"

This reverts commit eddb2722ebfd58ed33b47ef735c8f26260b0b1b8.

Conflicts:
	common/app/conf/switches.scala
Correct the switch descriptions
Update switches for new Formstack sites
adding image adjust to template
Merge branch 'master' into film-awards
Add admin assets route to dev-build
clarify that nginx setup is optional
Add ab live stats switch
Added sellByDate to Film Awards switches.
Merge pull request #2746 from guardian/ab-stats-switch

Ab stats switch
remove redundant mapping
Add right most popular component to article bootstrap
Merge pull request #2747 from guardian/remove-redundant-mapping

Remove redundant mapping