Added freetype DLL
Added world components
Fixed merge conflict