This brings the	following improvements:
 * Merged some bugfixes from upstream Annotator.
   Probably fixes #453 and fixes #501.
 * Brings back to sync our Annotator maintenance branch,
   the Annotator sources embedded in H,	and the	annotator JS embedded in H.