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

Conflicts:
	bin/classes/org/whut/client/CasClient.class
Merge branch 'master' of https://github.com/xiaozhujun/riskplatform-android

Conflicts:
	res/values/strings.xml