Environment updates
Merge branch 'master' into KellyVersion

Conflicts:
	ProjectSettings/ProjectSettings.asset