Made DataAcquisition generic in preparation for adding a second acquirer.
Add generic CSV file acquirer to Data Acquisition.
QC stage 3 now uses the location's country GAUL code if specified (previously it required a HealthMap country ID).
Add UploadCsvController to PublicSite
Add front end for uploading disease occurrence CSV. JavaScript tests to do.
Fixes following Travis
Fix following Travis
Merge branch 'master' into 241-upload-file-for-da

Conflicts:
	src/ivy-project-dependencies.xml
Merge branch 'master' into 241-upload-file-for-da

Conflicts:
	src/DataAcquisition/src/uk/ac/ox/zoo/seeg/abraid/mp/dataacquisition/acquirers/healthmap/HealthMapAlertConverter.java
	src/DataAcquisition/test/uk/ac/ox/zoo/seeg/abraid/mp/dataacquisition/acquirers/healthmap/HealthMapAlertConverterTest.java
Merge pull request #196 from SEEG-Oxford/241-upload-file-for-da

Upload disease occurrence CSV file