Move cuke scenario not related to attachments
Tidy up attachments feature
Whitespace
Restore adding and saving of HTML & file attachments
Test for HTML & file attachment ordering interface