这是个意外
Merge branch 'master' of https://github.com/tealun/Tchat

Conflicts:
	_SYNCAPP/metadata.xml