Add UK to countries list
Add 'include_uk' option to country select
Merge remote branch 'origin/include-uk-in-country-select'