Memory leak fixed!
fixes
finished texturemanger for now and added enums for textures
merge with master
Texture enums implemented
merge with master and conflicts fixed
MEGA MERGE CONFLITSSCSDS
Merge fix with master