…
Merge branch 'bf' into resources

Conflicts:
	STC-API/STC-API/STC-API.csproj