Merge branch 'master' into qt-client

Conflicts:
	sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
	sflphone-client-kde/src/conf/dlgaccounts.cpp
	sflphone-client-kde/src/conf/dlgaccounts.h
	sflphone-client-kde/src/conf/dlgaccountsbase.ui
	sflphone-client-kde/src/main.cpp
	sflphone-common/libs/pjproject/build/os-auto.mak
	sflphone-common/libs/pjproject/config.guess
	sflphone-common/libs/pjproject/config.sub
	sflphone-common/libs/pjproject/pjlib/build/os-auto.mak
	sflphone-common/src/dbus/configurationmanager-introspec.xml
	sflphone-common/src/managerimpl.cpp