车友圈文章发表
Merge branch 'master' of https://git@github.com/wisegps/Wawc.git

Conflicts:
	AndroidManifest.xml
	src/com/wise/pubclas/UploadUtil.java