Do not add/remove the same entities again
Merge branch 'master' of git@github.com:varesa/GameEngine.git