Setting gaelic language if programme is from Alba channel
Fixed conflicts
Merge branch 'stage' of github.com:atlasapi/atlas-feeds into stage