Fixed some issues resolving block shapes, addressing #702
(There is still a problem with creating new freeform blocks in multiplayer)
Merge branch 'multiplayer' of git@github.com:MovingBlocks/Terasology.git into multiplayer