...
Merge branch 'scenegraph' of ssh://github.com/KPWhiver/DimLib into scenegraph

Conflicts:
	src/window.cpp
Merge branch 'scenegraph' of ssh://github.com/KPWhiver/DimLib into scenegraph
Changed the code to make it compile in gcc