sdfs
Merge branch 'master' of https://github.com/QuenZhan/TrnthUnityUtility

Conflicts:
	TrnthActivatorCollision.cs