Merge branch 'master' into presence_sip_dev

astylerc

daemon/src/account_schema.h

daemon/src/audio/alsa/alsalayer.cpp

daemon/src/audio/audiortp/audio_rtp_record_handler.cpp

daemon/src/audio/audiortp/audio_rtp_session.cpp

daemon/src/audio/pulseaudio/pulselayer.cpp

daemon/src/audio/samplerateconverter.cpp

daemon/src/audio/samplerateconverter.h

daemon/src/managerimpl.cpp

daemon/src/sip/sdp.cpp

daemon/src/sip/sdp.h

daemon/src/sip/sip_utils.cpp

daemon/src/sip/sip_utils.h

daemon/src/sip/sipaccount.cpp

daemon/src/sip/sipaccount.h

daemon/src/sip/sipcall.cpp

daemon/src/sip/sipcall.h

daemon/src/sip/siptransport.cpp

daemon/src/sip/sipvoiplink.cpp

daemon/src/video/shm_sink.cpp