created new module odcsft-util
moved some util classes to odcsft-util
gitignore
odcsft-utils StatementMapper
new conflict resolution preparation