Notification times are saved in the database
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Notification time is saved in database