12:50
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/reminders.php
	application/models/mreminders.php