Removed function call.  ontime issue 1751
added test for existing annotations
Moved Critical Editions to object-level tab
resolved conflicts
Reordered tabs
Simplified display logic
Merge conflicts resolved
Merge Alan's work
Merge pull request #25 from mitchmac/7.x

Move critical edition tab