boot->SMVC
添加spring-test依赖
spring mvc 配置强化
Merge branch 'master' of https://github.com/tengzhaoqi2012/study.git

Conflicts:
	SMVC/pom.xml