Merge branch 'master' of https://github.com/rccarrasco/ocralign

Conflicts:
	src/main/java/eu/digitisation/ocralign/Main.java