DateUtil added getDateOfWeek function.
Added ConflictDao
Merge branch 'master' of https://github.com/hhagmans/Ticket-Boys