Merge branch 'TeamTableView' into Developer-Branch

Conflicts:
	FitTogether/FitTogether/TeamData.swift
	FitTogether/FitTogether/TeamDataViewController.swift