Added string class (unused yet)
Replaced std::string with String
Removed some imminent bugs
Merge branch 'develop' into materials

Conflicts:
	Projects/Mac/Wonderland.xcodeproj/project.pbxproj
	Renderer/GL/MaterialCacheGL.cpp
	Renderer/GL/MaterialCacheGL.h
	Renderer/GL/RendererGL.cpp
	Renderer/MaterialInstance.cpp
	Renderer/MaterialInstance.h