Merge branch 'master' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone

creating the udp server have been wrongly introduce in the isStunEnable "if" condition

Conflicts:
	sflphone-common/src/sip/sipvoiplink.cpp

Conflicts:
	sflphone-client-gnome/pixmaps/usersActive.svg
	sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
	sflphone-common/src/dbus/callmanager.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp

Merge branch 'master' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone