test
Merge branch 'master' of https://github.com/xiaozhujun/riskplatform-android

Conflicts:
	bin/RiskPlatform.apk
	bin/classes.dex
	bin/classes/org/whut/platform/MoreActivity.class
	bin/resources.ap_