Added ability to let the client correct the player position
Minor style fixes
Merge branch 'master' into maze