gui/glfw now compiling under linux.
More minor cleanup, and added glfw3 to the qt .pro file.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into openGL2