Merge branch 'master' into fonseca

sflphone-client-gnome/.settings/org.eclipse.cdt.core.prefs

sflphone-client-gnome/.settings/org.eclipse.cdt.ui.prefs

sflphone-client-gnome/src/config/preferencesdialog.c

...-client-gnome/src/dbus/configurationmanager-introspec.xml

sflphone-client-gnome/src/dbus/dbus.c

sflphone-client-gnome/src/dbus/dbus.h

sflphone-client-gnome/src/main.c

sflphone-client-gnome/src/mainwindow.c

sflphone-client-gnome/src/statusicon.c

sflphone-client-gnome/src/statusicon.h

sflphone-client-gnome/src/uimanager.c

sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp

sflphone-common/src/audio/audiortp/AudioRtpFactory.h

sflphone-common/src/audio/audiortp/AudioRtpSession.h

sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp

sflphone-common/src/audio/audiortp/AudioZrtpSession.h

sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp

sflphone-common/src/dbus/configurationmanager-introspec.xml

sflphone-common/src/dbus/configurationmanager.cpp

sflphone-common/src/dbus/configurationmanager.h