Style team gladiator page
minor changes, but bug in team.coffee
fix merges
Merge branch 'master' of https://github.com/PqBenoit/scrum

Conflicts:
	app/views/teams/show.html.erb