Made moveEntity work immediately if not in update cycle
Stopped Animation::select() from starting animation
Merged the same conflicts again...