Prevent client from connecting multiple times. AH-310
AH-261 Cleaned up joints and fine tuned climbs
Merge remote-tracking branch 'origin/master' into AH-290_OBBvsTriangle

Conflicts:
	Client/Bin/UserOptions.xml