smack sources removed, no relaying on PEP, using packet extension in presence instead
merge issues fixed