refactor implicit usage of Edition in templates
add support for overriding switches configuration in non production environments for switches wrapped in HttpSwitch (ie HttpSwitch(AudienceScienceSwitch).isSwitchedOn instead of AudienceScienceSwitch.isSwitchedOn)
Merge remote-tracking branch 'origin/master' into http-switches
fix query string assembly if query parameters are already present
fix query string assembly if query parameters are already present
fix query string assembly if query parameters are already present
use LinkTo on article pages
force http switches to be ignored on production environment
Merge remote-tracking branch 'origin/master' into http-switches
fix tests
Renamed DFP LineItems classes to avoid confusion

I get confused easily.
Merge branch 'master' of github.com:guardian/frontend
fix tests
fix pagination tests
Merge remote-tracking branch 'origin/master' into http-switches
Merge remote-tracking branch 'origin/master' into http-switches
fix pagination tests
Added "production office" and operating system to omniture.

This did modify the content api query which caused a data refresh.
Remove title attribute from @image
adding functionality for two and 3 article dfp components