Merge pull request #21 from Edzelopez/AMGA-5

AMGA-5 Added support for event template
AMGA-5 Changed to Supervised rule for Orgs