fixing up merge
fixing up merge

glenrobson/SimpleAnnotationServer,glenrobson/SimpleAnnotationServer,glenrobson/SimpleAnnotationServer,glenrobson/SimpleAnnotationServer,glenrobson/SimpleAnnotationServer