added id filter and parent_id to annotation_code
added / to web_location path in ImageResource
Merge branch 'master' of github.com:catami/catami