Changed DateStringComparator to suit new ModelTask
Merge remote-tracking branch 'origin/krystal'