Merge branch 'master' of https://github.com/dzzmitry/jc

Conflicts:
	dzapi/jcocr.c