wzg 修复
BUG #6525
BUG #6527
BUG #6168
BUG #6361
BUG #6545
wzg
Merge branch 'master' of https://github.com/jiangzhen1984/V2TechConferenceClient

Conflicts:
	source/libs/armeabi/libv2client.so
	source/libs/armeabi/libv2vi.so
	source/libs/libv2client.so
	source/libs/libv2vi.so