merge problems fix
Merge branch 'master' of https://github.com/mff-uk/intlib

Conflicts:
	RDF_extractor/src/main/java/gui/ConfigDialog.java