Merge branch 'master' of C:\Users\olga\Projects\beam with conflicts.
setting the default locale to UK