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

Conflicts:
	AndroidManifest.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml