Fixes to effectsystem
changed the order when removing entites.
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows