fixing name db consitent with country names
Merge branch 'devel'
tweaks to error reporting for name upload to db