Solved the bug, found another....AH-458
Merge branch 'master' into AH-458_Player_collisions_are_wrong
Found the problem, now on to fix it! AH-458

Need to fix so that the server doesn't change player positions through the physics engine.
Merge remote-tracking branch 'origin/master' into AH-458_Player_collisions_are_wrong
Removed debug code. AH-458