wzg commit first
wzg change version
wzg commit second
Merge branch 'master' of
https://github.com/jiangzhen1984/V2TechConferenceClient

Conflicts:
	source/AndroidManifest.xml