Merged the new textures without conficts
Merge branch 'newLevels' into develop