Merge branch 'Justin-Development'
Merge branch 'Justin-Development'
Major rewrite of how textures are handled