New Importer properties
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	patientview/src/main/resources/patientview.properties