renaming, cleanup and billingCompanyFactory
Merge branch 'develop' of https://github.com/thedarkjester/CPD7045 into develop

Conflicts:
	src/Aps.Core.Tests/CoreTests/SchedulingEngineTest.cs
	src/Aps.Core.Tests/CoreTests/ScrapeSessionInitiatorTest.cs
	src/Aps.Core.Tests/InterpreterTests/ScrapeSessionXMLToDataPairConverterTests.cs
	src/Aps.Core.Tests/ValidatorTests/ScrapeSessionDataValidatorTests.cs
merge conflicts
missing files
Merge branch 'develop'