Fix for ids
Merge branch 'master' of https://github.com/mjtong/XMPPFramework