Fixed the order of CmsDataFiles
Fixed piece of GpCalendar
Merge pull request #204 from mmukai/master

Fixed CmsDataFiles and GpCalendar