Performance bug fix. Bumped FPS from 30 to 60 on 5K sprites :)
Resolve merge conflicts