添加新maven工程
Merge branch 'master' of git@github.com:chenyuelin/JavaExplorer.git

Conflicts:
	SpringMvc3.1/WebContent/WEB-INF/configuration/servletConfig/servletCoreContext.xml