Update
Merge branch 'master' of https://github.com/quietdev/main.git

Conflicts:
	android/pkgs/VideoSDK/src/com/sdk/video/MediaChannel.java
	android/x264EncoderTest/src/com/example/x264encodertest/MainActivity.java