1、修复各种bug.
Merge branch 'master' into developer
1、添加tomcat jdni方式
Merge branch 'master' into developer

Conflicts:
	insight/src/main/resources/applicationContext.xml