ok
Merge branch 'origin/master'
ok
Merge branch 'origin/master'

Conflicts:
	TEST/DPR/FarmacyTest.dpr
	TEST/DPR/FarmacyTest.dproj