Working on rspec test
Merge remote-tracking branch 'origin/CreateEvent' into CreateEvent