Merge
Reminder add role to reminder
Date fields in message Form
Merge remote-tracking branch 'origin/master'