added eventManager
Merge branch 'master' of https://github.com/josefflores/csr