Signed-off-by: ada87 <ada87@163.com>
Merge branch 'master' of https://github.com/xdnote/xdmvc

Conflicts:
	WebContent/WEB-INF/web.xml

Signed-off-by: ada87 <ada87@163.com>
Signed-off-by: ada87 <ada87@163.com>