hallo
Merge remote-tracking branch 'origin/master'

Conflicts:
	V1.3/mainFormny.pas