Updated to include Teams
Merge branch 'development'

Conflicts:
	spaceplandata.pyc