Switched persistence over to using the new, implementation agnositic type handler system.
Merge branch 'develop' of git@github.com:MovingBlocks/Terasology.git into develop