renamed municipalities to counties

NOMUnicipalitySelect and it's corresponding choices weren't
municipalities but rather counties
Merged counties-fix from @jensadne - fixed conflicts
Merged from small-fixes