Base classes added all(List) and update(List)

ConflictFinder added generateConflictFor
Merge branch 'master' of https://github.com/hhagmans/Ticket-Boys.git