Show Image hierarchy button in right-panel toolbar
'ROI Count' label fix
Show spinner while loading annotations dialog
More compact Add Comment form
Move 'Owner:' to 3rd row for Images
Move 'Owner:' to 3rd row for P/D/S/P/Tag
Add separator in toolbar info panel
Improved spinner for attachments dialog
Fix 'Add Comment' by delay in hiding button
Move 'Full viewer' button into right panel toolbar
Object ID and Owner labels consistent and aligned
Hierarchy icon missing from earlier commits
Merge remote-tracking branch 'origin/develop' into general_pane_web_2

Conflicts:
	components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/includes/name.html
Fix display of description for P/D/I you can't edit
Remove print statement
Fix robot tests with new data_heading_id
Upgrading jquery.form.js to fix file upload bug
Fix full width 'Full viewer' button in Safari
Use Title-case for 'Image ID:' etc
Merge pull request #3207 from will-moore/general_pane_web_2

General pane web 2