Add support for Messages, and more attributes of the Job element.

Also, add a report to summarize conflicts in an annotation file.