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
Set database character set to UTF-8
Add database connection pooling using c3p0
Uncommitted file
Merge branch 'master' into 221-expert-profile-editing
Fix phantomjs URL
Remove workarounds in Common\ivy.xml as they no longer cause errors during resolve.libs
Upgrade to Hibernate 4.3.6
Upgrade spring-context to 4.0.2 for consistency with other Spring modules
Remove unused DiseaseExtent module
Fix phantomjs URL
Unfix phantomjs URL (Travis sorted itself out)
Unfix phantomjs URL (Travis sorted itself out)
Minor ivy.xml tidy-ups
Merge pull request #170 from SEEG-Oxford/207-db-connection-pooling

Add database connection pooling using c3p0
Merge pull request #169 from SEEG-Oxford/db-utf8

Set database character set to UTF-8
Merge pull request #165 from SEEG-Oxford/230-admin1-country-level

Include country-level points in admin 1 disease extent generation
Merge pull request #173 from SEEG-Oxford/remove-ivy-workarounds

Some build tidy-ups
Minor cleanups
Rejig how subpath is specified for table macros
clean up
Merge pull request #167 from SEEG-Oxford/221-expert-profile-editing

Expert profile editing