Almost Complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	editGeneralInformation.php
	editTeamInformation.php