test
Merge https://github.com/xiaozhujun/platform

Conflicts:
	riskManagement/src/main/webapp/WEB-INF/security-applicationContext.xml