ok
Merge remote-tracking branch 'origin/master'
ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	Forms/Document/TaxCorrectiveJournal.dfm
	Forms/Document/TaxCorrectiveJournal.pas