Renamed Images enum to something more appropriate (because of Texture
objects) among other things.
??? Merging confuzzlation again
Merge remote-tracking branch 'origin/master'