Merge branch 'Texture_Loader'