Fixes for attribute collections & XDI export

- Attribute collections are now properly represented with a diamond
shape
- XDI export appropriately HTML escape the XDI statements