dfsdfs
Merge branch 'opengl' of github.com:smogpill/dataspace into opengl

Conflicts:
	src/core/coCompilerMSVC.cpp