飞
Merge branch 'master' of https://github.com/oday0312/taotaokanAndroid

Conflicts:
	.idea/workspace.xml
	out/production/taotaokanAndroid/taotaokanAndroid.apk
	out/production/taotaokanAndroid/taotaokanAndroid.unaligned.apk