duhao xmpp test
Merge branch 'master' of https://github.com/YiJuCode/ioscode

Conflicts:
	Get2her/Get2her/Src/CreatRidCardTVC.m