Merge pull request #172 from jkuk/master

BLEB! Lots of changes for richards and peeps and me
commented my manager classes and updated sub event privilege checks
Merge remote-tracking branch 'upstream/master'