Changed name of Composition element to CnpComposition.
Changed name of element Composition class to CnpComposition
Went back to having tags only comma-separated, plus a couple bug fixes in change to CnpComposition