Merge branch 'Developer-Branch' into TeamTableView

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