rename folder to be holidays and fix type name
Merge branch 'master' into develop