Added dates to attachments
Merge remote-tracking branch 'origin/master'
Corrected file attachment - bug #306