Index: code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc
===================================================================
--- code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc	(revision 590)
+++ code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc	(revision 592)
@@ -654,7 +654,7 @@
 
     /**
-        @param Writes the content of the list, containing all lines of the config-file, into the config-file.
-        @param filename The name of the config-file
-    */
+     *  @param Writes the content of the list, containing all lines of the config-file, into the config-file.
+     *  @param filename The name of the config-file
+     */
     void ConfigValueContainer::writeConfigFile(const std::string& filename)
     {
Index: code/branches/FICN/src/orxonox/core/Identifier.h
===================================================================
--- code/branches/FICN/src/orxonox/core/Identifier.h	(revision 590)
+++ code/branches/FICN/src/orxonox/core/Identifier.h	(revision 592)
@@ -67,5 +67,7 @@
 
         public:
-            /** @brief Sets the Factory. @param facotry The factory to assign */
+            /** @brief Sets the Factory.
+             *  @param factory The factory to assign
+             */
             inline void addFactory(BaseFactory* factory) { this->factory_ = factory; }
 
Index: code/branches/FICN/src/orxonox/orxonox.cc
===================================================================
--- code/branches/FICN/src/orxonox/orxonox.cc	(revision 590)
+++ code/branches/FICN/src/orxonox/orxonox.cc	(revision 592)
@@ -467,5 +467,5 @@
     particle::ParticleInterface *e = new particle::ParticleInterface(mgr,"engine","Orxonox/strahl");
     e->particleSystem_->setParameter("local_space","true");
-    e->setPositionOfEmitter(0, Vector3(0,-10,200));
+    e->setPositionOfEmitter(0, Vector3(0,-10,0));
     e->setDirection(Vector3(0,0,-1));
     e->addToSceneNode(node);
@@ -480,12 +480,11 @@
     w->addToSceneNode(node);
 
-    particle::ParticleInterface *tt = new particle::ParticleInterface(mgr,"thrusters","Orxonox/treibwerk");
+    particle::ParticleInterface *tt = new particle::ParticleInterface(mgr,"twinthruster","Orxonox/engineglow");
     tt->particleSystem_->setParameter("local_space","true");
     tt->newEmitter();
-    tt->setDirection(Vector3(0,0,1));
-    tt->setPositionOfEmitter(0, Vector3(15,0,-60));
-    tt->setPositionOfEmitter(1, Vector3(-15,0,-60));
+    tt->setDirection(Vector3(0,0,-1));
+    tt->setPositionOfEmitter(0, Vector3(20,-1,-15));
+    tt->setPositionOfEmitter(1, Vector3(-20,-1,-15));
     tt->addToSceneNode(node);
-
 
   }
Index: code/branches/FICN/src/orxonox/orxonox_ship.h
===================================================================
--- code/branches/FICN/src/orxonox/orxonox_ship.h	(revision 590)
+++ code/branches/FICN/src/orxonox/orxonox_ship.h	(revision 592)
@@ -41,13 +41,13 @@
   public:
     OrxonoxShip(Ogre::SceneNode*);
-	  virtual ~OrxonoxShip();
+    virtual ~OrxonoxShip();
 
-	  virtual bool initialise();
+    virtual bool initialise();
 
-	  void setMainThrust(const Ogre::Real);
-	  void setSideThrust(const Ogre::Real);
+    void setMainThrust(const Ogre::Real);
+    void setSideThrust(const Ogre::Real);
     void setYThrust(const Ogre::Real);
-	  void turnUpAndDown(const Ogre::Radian&);
-	  void turnLeftAndRight(const Ogre::Radian&);
+    void turnUpAndDown(const Ogre::Radian&);
+    void turnLeftAndRight(const Ogre::Radian&);
 
     InertialNode* getRootNode();
@@ -58,21 +58,21 @@
     int getAmmoStock();
 
-	  bool tick(unsigned long, Ogre::Real);
+    bool tick(unsigned long, Ogre::Real);
 
   protected:
 
   protected:
-	  Ogre::SceneManager *sceneMgr_;
-	  //Ogre::SceneNode *rootNode_;
+    Ogre::SceneManager *sceneMgr_;
+    //Ogre::SceneNode *rootNode_;
     InertialNode *rootNode_;
-	  Ogre::Entity *shipEntity_;
+    Ogre::Entity *shipEntity_;
 
-	  //Ogre::Vector3 currentSpeed_;  // relative to space
-	  Ogre::Vector3 currentThrust_; // relative to the ship
+    //Ogre::Vector3 currentSpeed_;  // relative to space
+    Ogre::Vector3 currentThrust_; // relative to the ship
     Ogre::Real baseThrust_;
-	  int objectCounter_;
+    int objectCounter_;
 
     weapon::BulletManager *bulletManager_;
-	  //Ogre::Vector3 bulletSpeed_;
+    //Ogre::Vector3 bulletSpeed_;
 
     weapon::BaseWeapon *mainWeapon_;
Index: code/branches/FICN/src/orxonox/particle/ParticleInterface.cc
===================================================================
--- code/branches/FICN/src/orxonox/particle/ParticleInterface.cc	(revision 590)
+++ code/branches/FICN/src/orxonox/particle/ParticleInterface.cc	(revision 592)
@@ -37,146 +37,146 @@
 namespace particle {
 
-	ParticleInterface::~ParticleInterface(void)
-	{
-		sceneManager_->destroyParticleSystem(particleSystem_);
+  ParticleInterface::~ParticleInterface(void)
+  {
+    sceneManager_->destroyParticleSystem(particleSystem_);
 
-		delete sceneNode_;
-		delete particleSystem_;
-		delete sceneManager_;
-	}
+    delete sceneNode_;
+    delete particleSystem_;
+    delete sceneManager_;
+  }
 
-	ParticleInterface::ParticleInterface( SceneManager *sceneManager, String name, String templateName )
-	{
-		sceneManager_ = sceneManager;
-		particleSystem_ = sceneManager->createParticleSystem(name, templateName);
+  ParticleInterface::ParticleInterface( SceneManager *sceneManager, String name, String templateName )
+  {
+    sceneManager_ = sceneManager;
+    particleSystem_ = sceneManager->createParticleSystem(name, templateName);
 
-		//Variabeln einlesen, Emitter1_ ist Referenz-Emitter
-		velocity_ = particleSystem_->getSpeedFactor();
-		colour_ = particleSystem_->getEmitter(0)->getColour();
-		rate_ = particleSystem_->getEmitter(0)->getEmissionRate();
-		distance_ = particleSystem_->getEmitter(0)->getTimeToLive();
+    //Variabeln einlesen, Emitter1_ ist Referenz-Emitter
+    velocity_ = particleSystem_->getSpeedFactor();
+    colour_ = particleSystem_->getEmitter(0)->getColour();
+    rate_ = particleSystem_->getEmitter(0)->getEmissionRate();
+    distance_ = particleSystem_->getEmitter(0)->getTimeToLive();
 
-		//Anzahl der Emitter
-		numberOfEmitters_ = particleSystem_->getNumEmitters();
-		standardizeEmitters();
-	}
+    //Anzahl der Emitter
+    numberOfEmitters_ = particleSystem_->getNumEmitters();
+    standardizeEmitters();
+  }
 
-	void ParticleInterface::standardizeEmitters(void)
-	{
-		//Abgleichen der anderen Emitter an die Variabeln
-		for (int i=1; i<numberOfEmitters_; i++) {
-			particleSystem_->getEmitter(i)->setColour( colour_ );
-			particleSystem_->getEmitter(i)->setTimeToLive( distance_ );
-			particleSystem_->getEmitter(i)->setEmissionRate( rate_ );
-		}
+  void ParticleInterface::standardizeEmitters(void)
+  {
+    //Abgleichen der anderen Emitter an die Variabeln
+    for (int i=1; i<numberOfEmitters_; i++) {
+      particleSystem_->getEmitter(i)->setColour( colour_ );
+      particleSystem_->getEmitter(i)->setTimeToLive( distance_ );
+      particleSystem_->getEmitter(i)->setEmissionRate( rate_ );
+    }
 
-	}
+  }
 
-	void ParticleInterface::addToSceneNode( SceneNode* sceneNode )
-	{
-		sceneNode_ = sceneNode;
-		sceneNode_->attachObject(particleSystem_);
-	}
+  void ParticleInterface::addToSceneNode( SceneNode* sceneNode )
+  {
+    sceneNode_ = sceneNode;
+    sceneNode_->attachObject(particleSystem_);
+  }
 
-	void ParticleInterface::dettachFromSceneNode ( void )
-	{
-		sceneNode_->detachObject(particleSystem_);
-		sceneNode_ = NULL;
-	}
+  void ParticleInterface::dettachFromSceneNode ( void )
+  {
+    sceneNode_->detachObject(particleSystem_);
+    sceneNode_ = NULL;
+  }
 
-	Real ParticleInterface::getVelocity()
-	{
-		return velocity_;
-	}
+  Real ParticleInterface::getVelocity()
+  {
+    return velocity_;
+  }
 
-	void ParticleInterface::setVelocity(Real v)
-	{
-		velocity_ = v;
-		//partikel anpassen
-		particleSystem_->setSpeedFactor(v);
-	}
+  void ParticleInterface::setVelocity(Real v)
+  {
+    velocity_ = v;
+    //partikel anpassen
+    particleSystem_->setSpeedFactor(v);
+  }
 
-	int ParticleInterface::getRate()
-	{
-		return rate_;
-	}
-	void ParticleInterface::setRate(int r)
-	{
-		rate_ = r;
-		//partikel anpassen
-		for (int i=0; i<numberOfEmitters_; i++) {
-			particleSystem_->getEmitter(i)->setEmissionRate(rate_);
-		}
-	}
+  int ParticleInterface::getRate()
+  {
+    return rate_;
+  }
+  void ParticleInterface::setRate(int r)
+  {
+    rate_ = r;
+    //partikel anpassen
+    for (int i=0; i<numberOfEmitters_; i++) {
+      particleSystem_->getEmitter(i)->setEmissionRate(rate_);
+    }
+  }
 
-	Real ParticleInterface::getDistance()
-	{
-		return distance_;
-	}
+  Real ParticleInterface::getDistance()
+  {
+    return distance_;
+  }
 
-	void ParticleInterface::setDistance(Real d)
-	{
-		distance_ = d;
-		//partikel anpassen
-		for (int i=0; i<numberOfEmitters_; i++) {
-			particleSystem_->getEmitter(i)->setTimeToLive(distance_);
-		}
-	}
-	ColourValue ParticleInterface::getColour()
-	{
-		return colour_;
-	}
+  void ParticleInterface::setDistance(Real d)
+  {
+    distance_ = d;
+    //partikel anpassen
+    for (int i=0; i<numberOfEmitters_; i++) {
+      particleSystem_->getEmitter(i)->setTimeToLive(distance_);
+    }
+  }
+  ColourValue ParticleInterface::getColour()
+  {
+    return colour_;
+  }
 
-	void ParticleInterface::setColour(ColourValue colour)
-	{
-		colour_ = colour;
-		//partikel anpassen
-		for (int i=0; i<numberOfEmitters_; i++) {
-			particleSystem_->getEmitter(i)->setColour(colour_);
-		}
-	}
+  void ParticleInterface::setColour(ColourValue colour)
+  {
+    colour_ = colour;
+    //partikel anpassen
+    for (int i=0; i<numberOfEmitters_; i++) {
+      particleSystem_->getEmitter(i)->setColour(colour_);
+    }
+  }
 
-	ParticleEmitter* ParticleInterface::getEmitter( int emitterNr )
-	{
-		if (!(emitterNr<numberOfEmitters_)) return NULL;
-		return particleSystem_->getEmitter(emitterNr);
-	}
+  ParticleEmitter* ParticleInterface::getEmitter( int emitterNr )
+  {
+    if (!(emitterNr<numberOfEmitters_)) return NULL;
+    return particleSystem_->getEmitter(emitterNr);
+  }
 
-	void ParticleInterface::newEmitter ( void )
-	{
-		particleSystem_->addEmitter(particleSystem_->getEmitter(0)->getType());
-		numberOfEmitters_=numberOfEmitters_+1;
-		particleSystem_->getEmitter(0)->copyParametersTo( particleSystem_->getEmitter(numberOfEmitters_-1) );
-	}
+  void ParticleInterface::newEmitter ( void )
+  {
+    particleSystem_->addEmitter(particleSystem_->getEmitter(0)->getType());
+    numberOfEmitters_=numberOfEmitters_+1;
+    particleSystem_->getEmitter(0)->copyParametersTo( particleSystem_->getEmitter(numberOfEmitters_-1) );
+  }
 
-	void ParticleInterface::setPositionOfEmitter ( int emitterNr, Vector3 position )
-	{
-		particleSystem_->getEmitter(emitterNr)->setPosition(position);
-	}
+  void ParticleInterface::setPositionOfEmitter ( int emitterNr, Vector3 position )
+  {
+    particleSystem_->getEmitter(emitterNr)->setPosition(position);
+  }
 
-	Vector3 ParticleInterface::getPositionOfEmitter ( int emitterNr )
-	{
-		return particleSystem_->getEmitter(0)->getPosition();
-	}
+  Vector3 ParticleInterface::getPositionOfEmitter ( int emitterNr )
+  {
+    return particleSystem_->getEmitter(0)->getPosition();
+  }
 
-	void ParticleInterface::setDirection ( Vector3 direction )
-	{
-		for(int i=0; i<numberOfEmitters_; i++) {
-			particleSystem_->getEmitter(i)->setDirection(direction);
-		}
-	}
+  void ParticleInterface::setDirection ( Vector3 direction )
+  {
+    for(int i=0; i<numberOfEmitters_; i++) {
+      particleSystem_->getEmitter(i)->setDirection(direction);
+    }
+  }
 
 
-	Vector3 ParticleInterface::getDirection ( void )
-	{
-		return particleSystem_->getEmitter(0)->getDirection();
-	}
+  Vector3 ParticleInterface::getDirection ( void )
+  {
+    return particleSystem_->getEmitter(0)->getDirection();
+  }
 
-	void ParticleInterface::switchEnable(){
-		bool enable=(!(particleSystem_->getEmitter(0)->getEnabled()));
-		for(int i=0; i<numberOfEmitters_; i++) {
-			particleSystem_->getEmitter(i)->setEnabled(enable);
-		}
-	}
+  void ParticleInterface::switchEnable(){
+    bool enable=(!(particleSystem_->getEmitter(0)->getEnabled()));
+    for(int i=0; i<numberOfEmitters_; i++) {
+      particleSystem_->getEmitter(i)->setEnabled(enable);
+    }
+  }
 
 }
Index: code/branches/FICN/src/orxonox/run_manager.cc
===================================================================
--- code/branches/FICN/src/orxonox/run_manager.cc	(revision 590)
+++ code/branches/FICN/src/orxonox/run_manager.cc	(revision 592)
@@ -94,5 +94,5 @@
 
   /**
-  * @param ogre_ The OgreControl object holding the render window and the Root
+  * @param *ogre The OgreControl object holding the render window and the Root
   */
   void RunManager::initialise(OgreControl *ogre)
