fixes for catalog:
only show annotated items by default in catalog, annotate a few more items better, and provide a new endopint for forwarding icons if they are internal
tidy following code review
Merge pull request #852 from ahgittin/fix/catalog-and-icons

fixes for catalog: