Merge pull request #20 from Edzelopez/AMGA-5

AMGA-5 Bug fixes and field limit fixes
AMGA-5 Added support for event template