fixes

more fixes
Merge branch 'master' of https://github.com/firashosn/peer4m

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