Merge branch 'release/1.1' into develop
fixed bug where destroy method on event controller was using old model reference
Merge branch 'develop'