added acknowledgement and more concentrator work
Merge ../Peters/XMPP-SN