粗略筛选功能
Merge branch 'master' of https://github.com/xiaozhujun/riskplatform-android

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/org/whut/platform/R$id.class
	bin/classes/org/whut/platform/R$layout.class
	bin/classes/org/whut/platform/R$menu.class
	bin/classes/org/whut/platform/R$string.class
	bin/classes/org/whut/platform/R$style.class
	gen/org/whut/platform/R.java
	res/values/strings.xml