Refactor Daos
Added Conflikt
Merge....
Merge branch 'master' of https://github.com/hhagmans/Ticket-Boys.git
Merge