wzg update code

Conflicts:

	source/AndroidManifest.xml
	source/src/com/V2/jni/ImRequest.java
	source/src/com/V2/jni/VideoRequest.java
	source/src/com/v2tech/service/GlobalHolder.java
	source/src/com/v2tech/view/ContactsTabFragment.java
	source/src/com/v2tech/view/ConversationsTabFragment.java
	source/src/com/v2tech/view/JNIService.java
	source/src/com/v2tech/view/conference/ConferenceCreateActivity.java
	source/src/com/v2tech/view/conference/GroupLayout.java
	source/src/com/v2tech/view/group/CrowdCreateActivity.java
	source/src/com/v2tech/vo/ConferenceGroup.java