Merge trunk into CDM 3.3
also preferring computed distributions in getOrderedDistributions()
marker.markerType always initialized and serialized
filtering descriptionElements by computed marker
change name of ReferencedMedia to ReferencedMediaBase (#2381)
javadoc on deprecated
added a new method to IMediaService that will return the complete ImageInfo object and not just the metadata. Removed persistence layer from call stack of IMediaService methods that talk to ImageMetaData.
Added a method to retrieve terms by class.
moved image functionality into the library
Also available in: Atom