Added new defines and redid Controller creation to use new standard and current EVENT functions
Merge branch 'master' of https://github.com/rbellido/Project