Update
Switch to sprites for better performance
.
Merge remote-tracking branch 'origin/shawn' into shawn