Merge branch 'master' into collisionAccuracy

Conflicts:
	Source/gg2/Scripts/charFixFringes.gml
	Source/gg2/Scripts/charRunPhysics.gml
undid revert maybe