Merge branch 'master' into jbonjean

sflphone-client-gnome/src/actions.c

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

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

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

sflphone-client-gnome/src/config/tlsadvanceddialog.h

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

sflphone-client-gnome/src/config/zrtpadvanceddialog.h

...-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/sflphone_const.h

sflphone-common/configure.ac

sflphone-common/src/Makefile.am

sflphone-common/src/account.h

sflphone-common/src/audio/audiolayer.h

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/AudioSrtpSession.cpp

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