Adding final ActivitiEvent implementation + tests + docs
Merge remote-tracking branch 'upstream/master'