最初的导入！
Merge branch 'master' of https://github.com/zidom/tmp-spring.git

Conflicts:
	pom.xml
	src/main/java/org/demo/MyWebApplicationInitializer.java
	src/main/resources/logback.xml
	src/main/webapp/WEB-INF/web.xml