Merge branch '1.7.1-CDIT-beta'

Conflicts:
	pom.xml
	src/archetypes/org/openvpms/archetype/organisation/party.organisationPractice.adl
	src/archetypes/org/openvpms/archetype/supplier/act.supplierAccountRefundEFT.adl
	src/java/org/openvpms/archetype/rules/patient/PatientRules.java
Corrected ProductCSVWriter test case for missing param