Jamie & Nicola | Event controller refactoring
Merge branch 'development' of github.com:yoshdog/challenge-me into development