Merge pull request #1 from MosheBerman/feature/picker

Feature/picker
Merge pull request #2 from MosheBerman/feature/timeline-fixes

Changed the way the picker handles dates internally to fix some bugs wit...