Improve progress counting in ChannelDayProcessingTask
Improve extraction of Nitro Encodings/Locations
Don't extract Nitro Broadcasts on unknown channel
Merge branch 'mbst-7010-nitro' into stage

* mbst-7010-nitro:
  Don't extract Nitro Broadcasts on unknown channel
  Improve extraction of Nitro Encodings/Locations
  Improve progress counting in ChannelDayProcessingTask

Conflicts:
	src/main/java/org/atlasapi/remotesite/bbc/nitro/ChannelDayProcessingTask.java