Fixed CmsDataFiles and GpCalendar

Fixed the order of CmsDataFiles
Fixed piece of GpCalendar