Filled in TODOs
Replaced EventDispatcher methods with a link to the EventDispatcher page
Merge remote-tracking branch 'upstream/dev' into documentation_updates2