Merge pull request #182 from jay-hodgson/release-1.18

SWC-364: only refresh the attachments of the entity when the edit dialog is visible
SWC-369: merge change up from develop