Conflicts:
	kadu-core/gui/CMakeLists.txt
	kadu-core/gui/menu/kadu-menu.cpp
	kadu-core/gui/menu/menu-inventory.cpp
	kadu-core/gui/widgets/account-edit-widget.cpp
	kadu-core/gui/widgets/account-edit-widget.h
	kadu-core/gui/widgets/modal-configuration-widget.cpp
	plugins/encryption_ng/actions/encryption-
set-up-action-description.cpp
	plugins/encryption_ng/encryption-ng-configuration-ui-handler.cpp
	plugins/encryption_ng/encryption-provider.h
	plugins/gadu_protocol/gui/widgets/gadu-edit-account-widget.cpp
	plugins/gadu_protocol/gui/widgets/gadu-edit-account-widget.h
	plugins/jabber_protocol/gui/widgets/jabber-
edit-account-widget.cpp
	plugins/jabber_protocol/gui/widgets/jabber-edit-account-widget.h

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>