Add tests for Event
Refactor event token generation, add tests
Clarify test name
Clean up Dictionary and tests
Merge branch 'master' into tests

Conflicts:
	app/models/event.rb
Update Event tests