ETC1 related changes
Merge branch 'master' of https://github.com/stratboy61/Gameplay

Conflicts:
	gameplay/src/Texture.cpp