Merge branch 'master' into conference

Conflicts:
	sflphone-client-gnome/pixmaps/Makefile.am
	sflphone-client-gnome/src/Makefile.am
	sflphone-client-gnome/src/actions.h
	sflphone-client-gnome/src/contacts/calltree.c
	sflphone-client-gnome/src/dbus/callmanager-introspec.xml
	sflphone-client-gnome/src/dbus/dbus.c
	sflphone-common/src/Makefile.am
	sflphone-common/src/audio/Makefile.am
	sflphone-common/src/audio/alsalayer.cpp
	sflphone-common/src/audio/audiolayer.h
	sflphone-common/src/audio/audiortp.cpp
	sflphone-common/src/audio/audiortp.h
	sflphone-common/src/audio/codecDescriptor.h
	sflphone-common/src/audio/pulselayer.cpp
	sflphone-common/src/audio/pulselayer.h
	sflphone-common/src/dbus/callmanager.h
	sflphone-common/src/iaxvoiplink.cpp
	sflphone-common/src/iaxvoiplink.h
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/managerimpl.h
	sflphone-common/src/sdp.cpp
	sflphone-common/src/sipcall.cpp
	sflphone-common/src/sipcall.h
	sflphone-common/src/sipvoiplink.cpp
	sflphone-common/src/sipvoiplink.h
	sflphone-common/test/Makefile.am