update
Merge branch 'master' of git@github.com:bit-jmm/ThreadTaobao.git

Conflicts:
	AndroidManifest.xml