Added constructors to CSprite and added more benchmarking.

Added two new constructors to CSprite to avoid reduntant wrting when
creating new CSprite objects.
Rewrote Actors with sprites to use the new constructors.
Added more details to the benchmarking.
Started working on water

Started working on water. Commiting to merge with upstream development.
Merge upstream development