Merge remote-tracking branch 'origin/master'

Conflicts:
	PhysGame/build/classes/Textures/GameSphere.png
	PhysGame/build/classes/Textures/Planet-P1-N.png
	PhysGame/build/classes/Textures/Planet-P1-P.png
	PhysGame/build/classes/Textures/Planet-P2-N.png
	PhysGame/build/classes/Textures/Planet-P2-P.png