New AnnotationMatrix class and multiple annotations files allowed
Improve HeatmapHeaders xml and reformat code