ljm am
Merge branch 'master' of https://github.com/ourteamLemon/Rencuo

Conflicts:
	Rencuo/Engin/Xmpp/XMPPEngine.h
	Rencuo/Engin/Xmpp/XMPPEngine.m