项目编码统一为UTF-8，在Window-Preferences-General-WorkSpaces里设置！
Merge branch 'master' of https://github.com/xiaozhujun/riskplatform-android

Conflicts:
	gen/org/whut/platform/R.java