Added JSON and Raw views of events for #507 and #461
Merge remote-tracking branch 'upstream/master'