Conflicts:
	daemon/src/account.cpp
	daemon/src/audio/audioloop.cpp
	daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
	daemon/src/managerimpl.cpp
	daemon/src/managerimpl.h
	daemon/src/sip/sipaccount.cpp
	daemon/src/sip/siptransport.cpp
	daemon/src/sip/sipvoiplink.cpp