Merge branch 'dev_conference' of git.linphone.org:linphone-private

Conflicts:
	mediastreamer2

diff --cc coreapi/linphonecore.c
Simple merge

diff --cc coreapi/linphonecore_jni.cc
Simple merge

diff --cc java/common/org/linphone/core/LinphoneCall.java
index 89d534782fb279e1e0f9f6c499e3e645683dbd3b,bac236dff32a4a3d08ccba536f528c74ba749664..b4a3866787bed30579594b1820b6ec2568f5fe9d
--- 1/java/common/org/linphone/core/LinphoneCall.java
--- 2/java/common/org/linphone/core/LinphoneCall.java
+++ b/java/common/org/linphone/core/LinphoneCall.java
@@@ -74,9 -68,9 +68,9 @@@ public interface LinphoneCall 
                /**
                 * Streams running
                 */
-               public final static State StreamsRunning = new State(ID_STREAMS_RUNNING,"StreamsRunning");
+               public final static State StreamsRunning = new State(7,"StreamsRunning");
                /**
 -               * Paussing
 +               * Pausing
                 */
                public final static State Pausing = new State(8,"Pausing");
                /**

diff --cc java/common/org/linphone/core/LinphoneCore.java
Simple merge

diff --cc mediastreamer2
index 9e7e1e64ef6287184f8d1642a52e60ad1838b30e,bd3e6772c9636002aed44f3056b20f265fd35281..560d2143d79f2f6555eb9c0f84733b5db61c0fa2
--- 1/mediastreamer2
--- 2/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 9e7e1e64ef6287184f8d1642a52e60ad1838b30e
 -Subproject commit bd3e6772c9636002aed44f3056b20f265fd35281
++Subproject commit 560d2143d79f2f6555eb9c0f84733b5db61c0fa2