Merge origin/master

Conflicts:
	lib/cz-cuni-mff-ksi-jinfer-base.jar
	lib/cz-cuni-mff-ksi-jinfer-twostep.jar