added more functionality to buttons in sectionContourConflictResolver, removed some unnecessary comments
Merge branch 'master' of https://github.com/larrylindsey/reconstructmergetool