Include country-level points in admin 1 disease extent generation
Merge branch 'master' into 230-admin1-country-level

Conflicts:
	src/Common/test/uk/ac/ox/zoo/seeg/abraid/mp/common/dao/NativeSQLTest.java
Merge pull request #165 from SEEG-Oxford/230-admin1-country-level

Include country-level points in admin 1 disease extent generation