Update disease groups and mappings to HealthMap diseases. Fix tests.
Add a GeoName table, which Data Acquisition now uses to look up feature codes before resorting to the web service. By pre-populating this table, historical data will be loaded more quickly.
Remove AdminUnitSimplifiedGlobal and AdminUnitSimplifiedTropical from the Java, as the underlying tables will be accessed directly via GeoServer.
Remove the foreign key from location.geoname_id to geoname, because the GeoName specified by HealthMap may not exist (and also the geoname table may well be temporary).
In Data Acquisition, clear lookups between transactions to avoid problems with stale Hibernate objects.
Move the approx() matcher to testutils.
Disable log4j during ant-run tests
Fix test data to reflect latest HealthMap data retrieval
Add 3 new name columns to table disease_group.
Rename columns called display_name to public_name.
Merge pull request #56 from SEEG-Oxford/113-update-disease-mapping

Update disease mappings and test data
Use Joda Time's ability to set the current date/time to a fixed number of milliseconds, in preference to a custom approx() matcher
Merge pull request #57 from SEEG-Oxford/113-update-disease-mapping-2

Use Joda Time's ability to set the current date/time to a fixed number o...
Merge branch 'master' into 105-model-run-trigger

Conflicts:
	src/Common/src/uk/ac/ox/zoo/seeg/abraid/mp/common/domain/AdminUnitSimplifiedGlobal.java
	src/Common/src/uk/ac/ox/zoo/seeg/abraid/mp/common/domain/AdminUnitSimplifiedTropical.java
	src/Common/src/uk/ac/ox/zoo/seeg/abraid/mp/common/domain/DiseaseGroup.java