Fix geocoding
increase coverage
Merge branch 'master' into fe_docker

Conflicts:
	Gemfile.lock