Fix for race condition causing NullPointerException when joining server
Merge branch 'multiplayer' of git@github.com:MovingBlocks/Terasology.git into multiplayer