no update
Merge branch 'master' of https://github.com/ChinaWuxiandroid/chianwuxi_android

Conflicts:
	chinaw/bin/chinaw.apk
	chinaw/bin/classes.dex
no update