Added events for comments and attachments
Updated userguide with final event-types
Merge remote-tracking branch 'upstream/master'