Merge branch 'master' of https://github.com/tengzhaoqi2012/study.git

Conflicts:
	SMVC/pom.xml
Merge branch 'master' of https://github.com/tengzhaoqi2012/study.git