[i] Refactoring
Merge branch 'master' of github.com:astralaster/oxofrmbl

Conflicts:
	src/base/gui/widgets/ContactListWidget.cpp
[i] contact authorization improved (resolves #15)