Cahnges in 3d model. Textures are now applied manually
solved merge conflicts
solved merge cnflicts