fixed the sprite class
Merge branch 'gamestatemanager' into develop
merged gamestatemanager with develop