XML_Parser, Container list (with filled containers), sockets
Merge branch 'Hugo'
Merge branch 'Hugo's'