modified:   src/keymap.py
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/keymap.py
test git
test Git

Merge remote-tracking branch 'upstream/master'
select country in keyboard selection screen.
Merge branch 'master' of https://github.com/arcnexus/Cnchi

Conflicts:
	src/keymap.py
Removed keymap.py.orig