More done
Merge ../Peters/XMPP-SN
upgrade concentrators, new naming of others
Merge ../Peters/XMPP-SN