Merge pull request #946 from MarcinSc/develop

Cinematic (Smooth) camera video setting to use during recording presenta...
Merge pull request #951 from MarcinSc/develop

Adding last one missing consume() (I hope).
Fixed MappedContainer deserialization
Merge branch 'develop' of git@github.com:MovingBlocks/Terasology.git into develop
Little tweak to CameraSetting.