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

Conflicts:
	src/core/coBase.h