Merge remote-tracking branch 'origin/2.1'

diff --cc csync/src/csync_update.c
Simple merge

diff --cc src/gui/accountsettings.cpp
Simple merge

diff --cc src/gui/share.cpp
Simple merge

diff --cc src/gui/share.h
Simple merge

diff --cc src/gui/socketapi.cpp
Simple merge