update with links
Merge ../Peters/XMPP-SN