添加了测试类
Merge branch 'master' of
ssh://git@github.com/JingkaiZhao/TongjiLifeBible.git

Conflicts:
	TJLifeBibleServer/WebRoot/assets/js/pushlet-client.js