forms
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Load_PostgreSql/Farmacy/Load_Farmacy.dproj.local
	TEST/SOURCE/dbProcedureTest.pas