Merge branch 'master' of gitlab.linphone.org:/BC/public/linphone-desktop into fix/conference_crash

# Conflicts:
#	linphone-sdk
in 14 minutes and 15 seconds and was queued for 2 seconds