wzl merge friend and group authentication
fixed bug 6971
Merge branch 'merge_auth'
Merge branch 'master' of https://github.com/jiangzhen1984/V2TechConferenceClient

Conflicts:
	source/src/com/v2tech/view/conversation/QualificationMessageActivity.java