Entity system update, plaguewalker, Love 9.0
fixed merge conflicts