ok
Merge branch 'origin/master'

Conflicts:
	Forms/EDI/EDIJournal.pas