small change in the UI for adding a country, now the name of the country goes first, easier
Merge remote branch 'origin/develop' into develop