Style fixes.
Merge branch 'develop' of git@github.com:MovingBlocks/Terasology.git into develop
Style fixes.