Passing all tests! Except 2 Gesiler fix
Merge branch 'dev'

Conflicts:
	app/models/match.rb
	app/views/matches/show.html.erb