#15 modify EventControllerSpec
Merge branch 'dev' of https://github.com/Ornro/ThatNight into dev