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
Navbar changes for new views
Move some bits into better namespaces, and other minor cleanups
Factor out reusable parts of user registration details view
Refactor to seperate reusable parts for expert validation
Add expert profile editing functionality
minor fixes
make sure user updated timestamp is updated
Update tests to reflect refactoring
Backfill some missing docs
Composition over inheritance
refactor tests to new composition
Server-side tests for user editing
minor cleanup
Add missing annotation
Add healthmap_country.centroid_override for countries whose centroids are not on land.
Use this field in QC stage 2 - if the location has country precision and its HealthMap country has a centroid_override point, replace the location point with the centroid_override point.
Refactor QCManager for consistency and to move some logging into the QCManager.
Set database character set to UTF-8
Add database connection pooling using c3p0
Uncommitted file