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
added function to fetch user avatar for a single element
added avatar and cancel button to main reply box
Merge branch 'master' of github.com:guardian/frontend into discussion-reply-avatar

* 'master' of github.com:guardian/frontend: (27 commits)
  Oops, really need to check the right thing...
  Change Content API url.
  Scala tests browser understands the selectors
  Fix a bug in firefox
  Small styling changes to comment sorting
  return replace domain
  CSS comment does not exceed the 80 char line limit
  fix switch checking
  Do not auto link to section tags
  Comment order element doesn't zoom
  Update _discussion.scss
  Use monocolumn wrapper on Ethical awards forms
  Numerous tweaks. Such styling. Much viewports. Wow.
  Truncate Masterclass description to 250 chars.
  text from theresa
  Update link to monitoring in CONTRIBUTING doc.
  Fix argument number in thumbnail item fragment
  Formstack styles for date and time
  Formstack styles for radio buttons
  Design tweaks to top stories and introduce support / image tone classes
  ...
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
added reply author and reply parent quote to reply comment box
Try keep bots off of our beacon...

1. Apply a `robots.txt` to the beacon server
2. Put `a rel="no-follow"` on the `<img>` tag in the html
Add the ability to log Beacon requests details.

Behind a switch as there are a lot of requests.
add masterclasses missing href from bottom link
added second missing link
Fixed test to reflect new Omniture URL
Merge branch 'master' of github.com:guardian/frontend into no-follow

Conflicts:
	common/app/conf/switches.scala