Merge remote-tracking branch 'origin/master'

Conflicts:
	prg/Albcli.prg
	prg/Facrec.prg
	prg/Factcli.prg
	prg/Pedcli.prg
	prg/Satcli.prg
	prg/Tpv.prg