connection
Merge branch 'master' of https://github.com/AndriM/Vika3

Conflicts:
	computerbase.ui