Commit before pull
Merge branch 'master' of https://github.com/rogerhzh/linphone_linux_XIA
Merge with oRTP and mediastreamer2