Merge Commit
Merge branch 'master' of github.com:marziolek/cracow-ocr-app

Conflicts:
	dev