Issue #72

Changes required by issue #72 - extending the groupEvent model
You're including multiple times the same file