hledani haluzi
Merge branch 'master' of github.com:moravianlibrary/K4-tools

Conflicts:
	src/main/java/cz/mzk/k4/tools/scripts/AddOcr.java
merge