Merge branch 'tmj-dev'

World.h

@@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/.
 #include "stars.h"
 #include "skydome.h"
 #include "messaging.h"
+#include "station.h"
 
 // wrapper for simulation time
 class simulation_time {
@@ -59,6 +60,8 @@ namespace simulation {
 
 extern simulation_time Time;
 
+extern basic_station Station; // temporary object, for station functionality tests
+
 }
 
 class opengl_renderer;