Merge pull request #457 from SalesforceFoundation/feature/411-main-scheduler

Feature/411 main scheduler
Modifying the test to remove seealldata=true
Merge pull request #461 from SalesforceFoundation/feature/271-fix-seealldata-test

Modifying the test to remove seealldata=true
Merge dev into feature/411-main-scheduler