Merge pull request #56 from Edzelopez/GEP-19

GEP-37 Added display for attachments
GEP-37 bug fixes