Added Events and Invitations Tests
Merge branch 'master' into iteration2-2

Conflicts:
	app/models/invitation.rb
	coverage/index.html
	coverage/resultset.yml