Merge branch 'master' into dev_vcard

Conflicts:
	.gitmodules

.gitmodules

@@ -43,3 +43,9 @@
 [submodule "submodules/belr"]
 	path = submodules/belr
 	url = git://git.linphone.org/belr.git
+[submodule "submodules/externals/libmatroska-c"]
+	path = submodules/externals/libmatroska-c
+	url = git://git.linphone.org/libmatroska-c.git
+[submodule "submodules/bctoolbox"]
+	path = submodules/bctoolbox
+	url = git://git.linphone.org/bctoolbox.git

bcg729 @ e540e0c4

-Subproject commit 91d1206d63e57a78af1d26058052e9d37f0b6f5d
+Subproject commit e540e0c4d5521c5125e1de496ad1085e642df120

bctoolbox @ 963d1ed9

+Subproject commit 963d1ed90a93546e737499d8192c859f0f6b114e

libmatroska-c @ c3fc2746

+Subproject commit c3fc2746f18bafefe3010669d8d2855240565c86

msamr @ 5e180193

-Subproject commit 326e8f035d45ff96c1d0072a52c758730727852a
+Subproject commit 5e180193d06e5d6b3394571ac7750b5359856c15

msilbc @ 4d36bb77

-Subproject commit d8114cbce20391b1222861a9276255589c4e0bb6
+Subproject commit 4d36bb77f6a7e259dc4c6f76b7aab3c65eaece96

msopenh264 @ 709e1f69

-Subproject commit d2acb63cca728f1efa4c1ffaf52ee0aee55f731f
+Subproject commit 709e1f6903914fa883ebcf26f51fece65e3e1ab5

mssilk @ e766ae43

-Subproject commit 0c10e9f890f8e24b12fff430d559de02a213b032
+Subproject commit e766ae43c503aa08080df9beb24a0fe81ce213bb

mswasapi @ 350f4510

-Subproject commit cf04af5559222eac11aa4f4a1979ce4ce39cca90
+Subproject commit 350f451051b7839e15c60b02830685ac3b0f9424

mswebrtc @ 113e9818

-Subproject commit 27680f2d99e6f431d8fcc433c4120ddf48263578
+Subproject commit 113e9818866ebbf75a03d4559d76ee89a6dcfd9f

msx264 @ 427e20ae

-Subproject commit 0831ca99e4aed1d98c0766d14b206742030cdf6d
+Subproject commit 427e20aeabcf62fbd2fdb48ab80f56833d3db790