1
Merge branch 'master' of git@github.com:weinianjie/web1.git

Conflicts:
	conf/spring-mvc.xml