test
test
test
Merge branch 'master' of https://github.com/zhaoxiaohui/webim

Conflicts:
	js/entity.js