A little bit of love for EntityManager and the editor.
Merge branch 'master' of https://github.com/MadTrial/Volge-TheSurvivor