Removed Sprite integration, using plain images instead
Merge remote-tracking branch 'origin/master'