wrong date use for holiday job
added holiday and leave for contractor time logging
fix can't log holiday
Merge branch 'dev' into dev_mirror