xx
Merge branch 'master' of https://github.com/liujunchina/Test_all.git

Conflicts:
	taobao/taobao.zip