Make it possible to turn on / off the country flags
Merge branch 'no-country-flags' into develop