Added generated id's to presence stanzas
Merge branch 'master' into plugins