Database and API changes

Made database changes. Started implementing Location and Team Tasks part
of API so I can continue development on some features for team part of
API.
Merge remote-tracking branch 'origin/master'

Conflicts:
	API/api/pub/models/Team.php
	Database/ERDiagram.png