Collision boxes fix
Merge branch 'master' of https://github.com/dex3r/UDSTURPG

Conflicts:
	vs/UDSTURPG/Entities/EntityPlayer.cs