ok
Merge branch 'origin/master'

Conflicts:
	FormsFarmacy/MainForm.dfm
	FormsFarmacy/MainForm.pas
	TEST/DPR/FarmacyTest.dpr
	TEST/DPR/FarmacyTest.dproj
	TEST/SOURCE/LoadFarmacyFormTest.pas
ok