Minor graphics/merge fixes

Removed merge conflict from comment in BaseSprite, changed
CannonFiredSFX to be non-mute, added an explosion to
GraphicsTestApplication.