changed directory structure - application in a dedicated dir
added parent pom
intellij projects
fixed bug in ExternalSort - some readers were not closed and could not be deleted
added module for conflict resolution
copied over sources from odcs-conflictresolution