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

Conflicts:
	FormsFarmacy/Load/ImportSettings.dfm
	FormsFarmacy/Load/ImportType.dfm
ok
Merge branch 'origin/master'
ok
Merge branch 'origin/master'

Conflicts:
	FormsFarmacy/Load/ImportSettings.dfm
	FormsFarmacy/Load/ImportType.dfm