Merge pull request #12 from Fanneyyy/kthorri

Kthorri
Merge pull request #13 from Fanneyyy/kthorri

alltaf ad brasa
Merge pull request #14 from Fanneyyy/kthorri

Kthorri
Laga eh
allt nýtt
Revert "allt nýtt"

This reverts commit 9f876d6f765ce20d488f01957058415209adb9bc.
Merge remote-tracking branch 'origin/master' into kthorri

Conflicts:
	addconnectionwindow.ui