Switched multiple references from AbstractEntitySprite to Sprite
Marked multiple Sprite methods as final

- Changed multiple simple sprites to refer to abstract Entity rather
than concrete types, since they don't need the knowledge provided by
those concrete types
Removed Tank.java.orig merge artifact
Merge pull request #321 from BU-CS673/Canfield-Staging-2

Canfield-Staging-2 -> Canfield