changed util library to use Calendar class (instead of internal CalendarDate class)