Merge branch 'develop' of https://github.com/nikolai80/Reminder into develop