refactor ConvertingIterator
new UriMapping interface
new CR - single conflict cluster resolution
fix odcsft-cr tests
remove idea project files
add dependency on Guava to production code
new CR - creation of statement models
new CR - refactor
Java 1.7
new CR - resolution without dependent properties
tests for ResourceDescriptionConflictResolver