Added texture loading in the ModelHelper but if it is enabled I'm just getting crashes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/assets/materials/Sci-fi_Tropical_city.mtl