添加国际化1
Merge branch 'master' of https://github.com/spee140622/j_s_spring

Conflicts:
	spring-mvc3-framework/pom.xml
	spring-mvc3-framework/spring.mvc.demo/pom.xml
	spring-mvc3-framework/spring.mvc.demo/src/main/java/org/w/spring/controller/TestController.java
	spring-mvc3-framework/spring.mvc.demo/src/main/webapp/WEB-INF/web.xml
	spring-mvc3-framework/web.framework/pom.xml