Date picker plus local notifications
Merge remote-tracking branch 'origin/master'