Merge pull request #1 from MasDennis/master

Master merge 7/28
Typo fix in Texture.class

Fixed a mistake in the Texture class by removing a hardcoded string in
the constructor for atlases.
Merge pull request #984 from Davhed/texture-class-fix

Texture class fix