template mapping for 'other' special on uk-alpha
Merge branch 'master' of github.com:guardian/frontend
Fix comment replies having a pick button appended to them twice. Bonzo to the rescue
Merge pull request #2466 from guardian/double-pick-button

Stop pick buttons appearing twice on replies
use news container
Merge branch 'master' of github.com:guardian/frontend
Fix logo path in the RSS
Added more variables for commercial components
Added job variables.
Merge remote-tracking branch 'origin/moreCommercialVariables' into commercial-components
Final tweaks to commercial component designs