Fixing some merge problems.

DatabaseHelper somehow disipeared...
Merge branch 'master' of github.com:Bacon41/Unreached-Data-Gathering

Conflicts:
	assets/tblPeopleCountryInfo.db
	src/org/unreacheddatagathering/DatabaseHelper.java