edit sprite
Merge branch 'dev'