增加testServlet
jarbao
KindEditor
Merge branch 'master' of https://github.com/231599447/b3log-solo.git

Conflicts:
	war/src/main/webapp/WEB-INF/web.xml
mearge