presentation top bar hotfix
Merge branch 'master' into f-language-selection

Conflicts:
	app/views/templates/presentation/country_map.eco
fix country detection