vestnik config
NTuple writer/parser/merger
Merge branch 'master'

Conflicts:
	sources/src/main/java/cz/cuni/mff/odcleanstore/fusiontool/config/ConfigConflictResolution.java
	sources/src/main/java/cz/cuni/mff/odcleanstore/fusiontool/config/ConfigImpl.java
Merge branch 'master' into vestnik
refactor
fix memory profiling info
refactor ExternalSortingInputLoader
merge transform exception
increase default memory amount allowed for external sort
improved logging (sameAs count)
refactored loader packages
partital prototype of new Ext Sort Loader
prototype of new Ext Sort Loader
tests
copied code of ExternalSort locally
modified local ExternalSort copy
fixed gzip compression use when sorting
refactoring
prototype test
replaced ExtSortLoader with the new prototype