! Rework Attachments / Browse Files navigation as per Mantis issue 4786

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #695 from Arantor/release-2.1

! Rework Attachments / Browse Files navigation as per Mantis issue 4786