Merge remote-tracking branch 'remotes/origin/master' into release

Conflicts:
	include/version.h

src/omega/omegaPythonApi.cpp

@@ -70,15 +70,17 @@ PyObject* omegaExit(PyObject* self, PyObject* args)
 {
     // Gracious exit code is broken. 
     SystemManager::instance()->postExitRequest();
-
-    // Do it the control-C way (it always works)
-    DisplaySystem* ds = SystemManager::instance()->getDisplaySystem();
-    // Explicitly kill sound server
-    SoundEnvironment* se = Engine::instance()->getSoundEnvironment();
-    if(se != NULL)
+    if(Engine::instance() != NULL)
     {
-        se->getSoundManager()->stopAllSounds();
-        se->getSoundManager()->cleanupAllSounds();
+        // Do it the control-C way (it always works)
+        DisplaySystem* ds = SystemManager::instance()->getDisplaySystem();
+        // Explicitly kill sound server
+        SoundEnvironment* se = Engine::instance()->getSoundEnvironment();
+        if(se != NULL)
+        {
+            se->getSoundManager()->stopAllSounds();
+            se->getSoundManager()->cleanupAllSounds();
+        }
     }
     Py_INCREF(Py_None);
     return Py_None;
@@ -1386,6 +1388,7 @@ BOOST_PYTHON_MODULE(omega)
         .def_readwrite("panopticStereoEnabled", &DisplayConfig::panopticStereoEnabled)
         .def_readwrite("canvasChangedCommand", &DisplayConfig::canvasChangedCommand)
         PYAPI_METHOD(DisplayConfig, setCanvasRect)
+        PYAPI_METHOD(DisplayConfig, bringToFront)
         PYAPI_GETTER(DisplayConfig, getCanvasRect)
         //.add_property("canvasPixelRect", 
         //    make_getter(&DisplayConfig::canvasPixelRect, PYAPI_RETURN_VALUE),

system/desktop.cfg

@@ -8,7 +8,7 @@ config:
 	// Aspect ratio: 1.78
 	display:
 	{
-		type = "Equalizer";
+		type = "GLFW";
 		geometry = "ConfigPlanar";
 		numTiles = [1, 1];
 		referenceTile = [0, 0];