...
...
Merge branch 'master' into objedex

Conflicts:
	STC-API/STC-API/STC-API/BgBmResource.cs
Merge branch 'engine' into objedex
BFS
,,,