Conflicts:
	.gitignore
	README.md
	code/CMakeLists.txt
	code/CMakeModules/ConfigureChecks.cmake
	code/CMakeModules/Find3dsMaxSDK.cmake
	code/CMakeModules/FindCustomMFC.cmake
	code/CMakeModules/FindMSVC.cmake
	code/CMakeModules/FindMercurial.cmake
	code/CMakeModules/FindWindowsSDK.cmake
	code/CMakeModules/PCHSupport.cmake
	code/CMakeModules/nel.cmake
	code/nel/CMakeLists.txt
	code/nel/include/nel/3d/animatable.h
	code/nel/include/nel/3d/animated_lightmap.h
	code/nel/include/nel/3d/animation_set_user.h
	code/nel/include/nel/3d/async_file_manager_3d.h
	code/nel/include/nel/3d/async_texture_manager.h
	code/nel/include/nel/3d/camera_col.h
	code/nel/include/nel/3d/cloud_scape_user.h
	code/nel/include/nel/3d/cluster.h
	code/nel/include/nel/3d/coarse_mesh_manager.h
	code/nel/include/nel/3d/fasthls_modifier.h
	code/nel/include/nel/3d/gpu_program_params.h
	code/nel/include/nel/3d/ig_surface_light_build.h
	code/nel/include/nel/3d/landscape.h
	code/nel/inclu...