fixed count
rebasing with master
Merge branch 'master' into migrate_groups_feed_to_nitro2
Merge branch 'master' into migrate_groups_feed_to_nitro2
Merge pull request #29 from iplayer/migrate_groups_feed_to_nitro2

Migrate groups feed to nitro2 - DO NOT MERGE