Spire branch back at origin/master.
Merge branch 'master' into spire.

Keeping origin/master.
Conflicts:
	src/CMakeLists.txt
Merge branch 'master' into spire
Re-enabled show nodes dialog option.
Refactored faces and edge creation to their own functions.

In preparation for displaying nodes.
Show nodes (as points) is working.
Added mouse buttons to GLWidget.
Fix CMake
Macro out Debug functions for later
Merge branch 'master' into spire
Windows build fix
Merge branch 'master' into dataOnField