Fixed Team Info
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/teamInfo.php