Index: code/branches/FICN/src/orxonox/objects/Ambient.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/Ambient.cc	(revision 556)
+++ code/branches/FICN/src/orxonox/objects/Ambient.cc	(revision 560)
@@ -33,4 +33,5 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "Ambient.h"
@@ -64,5 +65,5 @@
 	    	mgr->setAmbientLight(ColourValue(r,g,b));
 
-	    	std::cout << "Loader: Set ambient light: "<<r<<" " << g << " " << b  << std::endl << std::endl;
+	    	COUT(4) << "Loader: Set ambient light: "<<r<<" " << g << " " << b  << std::endl << std::endl;
     	}
    }
Index: code/branches/FICN/src/orxonox/objects/Camera.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/Camera.cc	(revision 556)
+++ code/branches/FICN/src/orxonox/objects/Camera.cc	(revision 560)
@@ -11,4 +11,5 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "Camera.h"
@@ -30,9 +31,9 @@
     {
     	Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
-    	
+
     	if (xmlElem->Attribute("name") && xmlElem->Attribute("pos") && xmlElem->Attribute("lookat") && xmlElem->Attribute("node"))
     	{
     		//		<Camera name="Camera" pos="0,0,-250" lookat="0,0,0" />
-    		
+
     		std::string name = xmlElem->Attribute("name");
     		std::string pos = xmlElem->Attribute("pos");
@@ -57,14 +58,14 @@
 
     		std::string node = xmlElem->Attribute("node");
-    		
+
 		    Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->getChild(node);
 		    sceneNode->attachObject((Ogre::MovableObject*)cam);
-	    
-	    	
+
+
 		    Ogre::Viewport* vp = orxonox::Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
-			    
 
-	    	std::cout << "Loader: Created camera "<< name  << std::endl << std::endl;
-    	}   	
+
+	    	COUT(4) << "Loader: Created camera "<< name  << std::endl << std::endl;
+    	}
    }
 }
Index: code/branches/FICN/src/orxonox/objects/Entity.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/Entity.cc	(revision 556)
+++ code/branches/FICN/src/orxonox/objects/Entity.cc	(revision 560)
@@ -6,4 +6,5 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "Entity.h"
@@ -25,5 +26,5 @@
     {
     	Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
-    	
+
     	if (xmlElem->Attribute("name") && xmlElem->Attribute("src") && xmlElem->Attribute("node"))
     	{
@@ -31,5 +32,5 @@
     		std::string src = xmlElem->Attribute("src");
     		std::string node = xmlElem->Attribute("node");
-    			
+
 			Ogre::Entity* entity = mgr->createEntity(name, src);
 
@@ -37,7 +38,7 @@
 		    sceneNode->attachObject((Ogre::MovableObject*)entity);
 
-	    	std::cout << "Loader: Created entity "<< name <<" with source " << src  << " at node " << node  << std::endl << std::endl;
-    	}   	
+	    	COUT(4) << "Loader: Created entity "<< name <<" with source " << src  << " at node " << node  << std::endl << std::endl;
+    	}
    }
-   
+
 }
Index: code/branches/FICN/src/orxonox/objects/SceneNode.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/SceneNode.cc	(revision 556)
+++ code/branches/FICN/src/orxonox/objects/SceneNode.cc	(revision 560)
@@ -6,4 +6,5 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "SceneNode.h"
@@ -25,5 +26,5 @@
     {
     	Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
-    	
+
     	if (xmlElem->Attribute("name") && xmlElem->Attribute("pos"))
     	{
@@ -36,9 +37,9 @@
 	    	String2Number<float>(z, pos[2]);
 
-    		
+
     		mgr->getRootSceneNode()->createChildSceneNode(name, Vector3(x,y,z));
-	    	
-	    	std::cout << "Loader: Created node "<< name <<" : "<<x<<" " << y << " " << z  << std::endl << std::endl;
-    	}   	
+
+	    	COUT(4) << "Loader: Created node "<< name <<" : "<<x<<" " << y << " " << z  << std::endl << std::endl;
+    	}
    }
 }
Index: code/branches/FICN/src/orxonox/objects/Skybox.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/Skybox.cc	(revision 556)
+++ code/branches/FICN/src/orxonox/objects/Skybox.cc	(revision 560)
@@ -33,4 +33,5 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "Skybox.h"
@@ -58,5 +59,5 @@
 	    	mgr->setSkyBox(true, skyboxSrc);
 
-	    	std::cout << "Loader: Set skybox: "<< skyboxSrc << std::endl << std::endl;
+	    	COUT(4) << "Loader: Set skybox: "<< skyboxSrc << std::endl << std::endl;
     	}
    }
Index: code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc	(revision 556)
+++ code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc	(revision 560)
@@ -11,4 +11,5 @@
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "../core/Debug.h"
 
 #include "SpaceshipSteeringObject.h"
@@ -32,5 +33,5 @@
     {
     	SpaceshipSteering* steering = orxonox::Orxonox::getSingleton()->getSteeringPointer();
-    	
+
     	if (xmlElem->Attribute("node") && xmlElem->Attribute("forward") && xmlElem->Attribute("rotateupdown") && xmlElem->Attribute("rotaterightleft") && xmlElem->Attribute("looprightleft"))
     	{
@@ -46,17 +47,17 @@
     	 	String2Number<float>(rotaterightleft, rotaterightleftStr);
     	 	String2Number<float>(looprightleft, looprightleftStr);
-	    
+
     		steering = new SpaceshipSteering(forward, rotateupdown, rotaterightleft, looprightleft);
-    		
+
 	    	Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
 		    Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->getChild(nodeStr);
-			    		
+
     		steering->addNode(sceneNode);
-    
-    
-    
-    
-	    	std::cout << "Loader: Initialized spaceship steering at node " << nodeStr << " values "<< forward << " " << rotateupdown << " "<< rotaterightleft << " "<< looprightleft << " "<< std::endl << std::endl;
-    	}   	
+
+
+
+
+	    	COUT(4) << "Loader: Initialized spaceship steering at node " << nodeStr << " values "<< forward << " " << rotateupdown << " "<< rotaterightleft << " "<< looprightleft << " "<< std::endl << std::endl;
+    	}
    }
 }
