Fix the scheduler and date picker to work together
Merge pull request #546 from timschofield/develop

Fix the scheduler and date picker to work together