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

Conflicts:
	FormsFarmacy/Load/ImportType.dfm
	TEST/DPR/ProjectTest.dpr
	TEST/DPR/ProjectTest.dproj
ok