Move annotations to _some_annotations.html.erb

And refactor admin_request/show.html.erb to use this.
Display annotations on user page.

Parameterise /admin_request/_some_annotations.html.erbi to allow it
to be called from user and request pages
Merge branch 'ab_annotations_1' into rails-3-develop