Index: /code/branches/presentation3/src/libraries/core/BaseObject.cc
===================================================================
--- /code/branches/presentation3/src/libraries/core/BaseObject.cc	(revision 7126)
+++ /code/branches/presentation3/src/libraries/core/BaseObject.cc	(revision 7127)
@@ -105,5 +105,5 @@
         }
     }
-    
+
     /** @brief Adds an object which listens to the events of this object. */
     void BaseObject::registerEventListener(BaseObject* object)
@@ -125,5 +125,5 @@
         XMLPortParam(BaseObject, "mainstate", setMainStateName, getMainStateName, xmlelement, mode);
         XMLPortParamTemplate(BaseObject, "template", addTemplate, getSingleTemplate, xmlelement, mode, const std::string&);
-        
+
         XMLPortObjectTemplate(BaseObject, Template, "templates", addTemplate, getTemplate, xmlelement, mode, Template*);
         XMLPortObject(BaseObject, BaseObject, "eventlisteners", addEventListener, getEventListener, xmlelement, mode);
@@ -372,5 +372,5 @@
     {
         this->registerEventStates();
-        
+
         COUT(4) << this->getIdentifier()->getName() << " (&" << this << ") processing event. originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << "), activate: " << event.activate_ << ", name: " << event.name_ << ", statename: " << event.statename_ << "." << std::endl;
 
Index: /code/branches/presentation3/src/libraries/core/BaseObject.h
===================================================================
--- /code/branches/presentation3/src/libraries/core/BaseObject.h	(revision 7126)
+++ /code/branches/presentation3/src/libraries/core/BaseObject.h	(revision 7127)
@@ -154,5 +154,5 @@
             inline Gametype* getOldGametype() const { return this->oldGametype_; }
             virtual void changedGametype() {}
-            
+
             inline void setLevel(const SmartPtr<Level>& level)
             {
Index: /code/branches/presentation3/src/libraries/core/Event.cc
===================================================================
--- /code/branches/presentation3/src/libraries/core/Event.cc	(revision 7126)
+++ /code/branches/presentation3/src/libraries/core/Event.cc	(revision 7127)
@@ -60,5 +60,5 @@
 
         COUT(4) << "Processing event (EventState) : originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << "), activate: " << event.activate_ << ", name: " << event.name_ << ", statename: " << event.statename_ << ", object: " << object->getIdentifier()->getName() << " (&" << object << ")" << "." << std::endl;
-        
+
         // check if the originator is an instance of the requested class
         if (event.originator_->isA(this->subclass_))
Index: /code/branches/presentation3/src/libraries/core/EventIncludes.h
===================================================================
--- /code/branches/presentation3/src/libraries/core/EventIncludes.h	(revision 7126)
+++ /code/branches/presentation3/src/libraries/core/EventIncludes.h	(revision 7127)
@@ -52,5 +52,5 @@
     } \
     XMLPortEventStateIntern(xmlportevent##function, classname, statename, xmlelement, mode)
-    
+
 #define XMLPortEventSink(classname, subclassname, statename, function, xmlelement, mode) \
     orxonox::EventState* containername##function = this->getEventState(statename); \
Index: /code/branches/presentation3/src/libraries/core/GUIManager.h
===================================================================
--- /code/branches/presentation3/src/libraries/core/GUIManager.h	(revision 7126)
+++ /code/branches/presentation3/src/libraries/core/GUIManager.h	(revision 7127)
@@ -103,9 +103,9 @@
 
         static GUIManager& getInstance() { return Singleton<GUIManager>::getInstance(); } // tolua_export
-        
+
     private:
         GUIManager(const GUIManager& instance); //!< private and undefined copy c'tor (this is a singleton class)
         void executeCode(const std::string& str);
-        
+
         template <typename FunctionType>
         bool protectedCall(FunctionType function);
Index: /code/branches/presentation3/src/libraries/core/OrxonoxClass.h
===================================================================
--- /code/branches/presentation3/src/libraries/core/OrxonoxClass.h	(revision 7126)
+++ /code/branches/presentation3/src/libraries/core/OrxonoxClass.h	(revision 7127)
@@ -108,5 +108,5 @@
             bool isParentOf(const OrxonoxClass* object);
             bool isDirectParentOf(const OrxonoxClass* object);
-            
+
             virtual void clone(OrxonoxClass*& item) {}
 
@@ -172,7 +172,7 @@
             std::vector<std::pair<unsigned int, void*> > objectPointers_;
     };
-    
+
     SUPER_FUNCTION(11, OrxonoxClass, clone, false);
-    
+
 }
 
Index: /code/branches/presentation3/src/libraries/core/Super.h
===================================================================
--- /code/branches/presentation3/src/libraries/core/Super.h	(revision 7126)
+++ /code/branches/presentation3/src/libraries/core/Super.h	(revision 7127)
@@ -267,17 +267,17 @@
     #define SUPER_changedGametype(classname, functionname, ...) \
         SUPER_NOARGS(classname, functionname)
-        
+
     #define SUPER_changedUsed(classname, functionname, ...) \
         SUPER_NOARGS(classname, functionname)
-        
+
     #define SUPER_clone(classname, functionname, ...) \
         SUPER_ARGS(classname, functionname, __VA_ARGS__)
-        
+
     #define SUPER_changedCarrier(classname, functionname, ...) \
         SUPER_NOARGS(classname, functionname)
-        
+
     #define SUPER_changedPickedUp(classname, functionname, ...) \
         SUPER_NOARGS(classname, functionname)
-        
+
     // (1/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
 
@@ -530,5 +530,5 @@
             ()
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
-        
+
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(10, changedUsed, false)
             ()
@@ -538,9 +538,9 @@
             (item)
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
-        
+
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(12, changedCarrier, false)
             ()
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
-        
+
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(13, changedPickedUp, false)
             ()
Index: /code/branches/presentation3/src/libraries/core/Template.cc
===================================================================
--- /code/branches/presentation3/src/libraries/core/Template.cc	(revision 7126)
+++ /code/branches/presentation3/src/libraries/core/Template.cc	(revision 7127)
@@ -107,5 +107,5 @@
             {
                 this->bLoadDefaults_ = temp->bLoadDefaults_;
-                
+
                 if (!temp->bIsReturningXMLElement_)
                 {
Index: /code/branches/presentation3/src/libraries/network/packet/Chat.cc
===================================================================
--- /code/branches/presentation3/src/libraries/network/packet/Chat.cc	(revision 7126)
+++ /code/branches/presentation3/src/libraries/network/packet/Chat.cc	(revision 7127)
@@ -60,6 +60,6 @@
   *(unsigned int *)(data_ + _MESSAGELENGTH ) = messageLength_;
 
-  /* cast the hell out of the message string, and copy it into the 
-   * data buffer. 
+  /* cast the hell out of the message string, and copy it into the
+   * data buffer.
    */
   memcpy( data_+_MESSAGE, static_cast<void*>(const_cast<char*>(message.c_str())), messageLength_ );
Index: /code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.h
===================================================================
--- /code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.h	(revision 7126)
+++ /code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.h	(revision 7127)
@@ -183,5 +183,5 @@
     }
   }
-  
+
   template <class T> void Synchronisable::registerVariable( std::set<T>& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
   {
Index: /code/branches/presentation3/src/libraries/util/Serialise.h
===================================================================
--- /code/branches/presentation3/src/libraries/util/Serialise.h	(revision 7126)
+++ /code/branches/presentation3/src/libraries/util/Serialise.h	(revision 7127)
@@ -636,15 +636,15 @@
         return checkEquality( (unsigned char&)((mbool&)variable).getMemory(), mem );
     }
-    
+
     // =========== std::set
-    
+
     template <class T> inline uint32_t returnSize( const std::set<T>& variable )
     {
         uint32_t tempsize = sizeof(uint32_t); // for the number of entries
         for( typename std::set<T>::iterator it=((std::set<T>*)(&variable))->begin(); it!=((std::set<T>*)(&variable))->end(); ++it)
-            tempsize += returnSize( *it ); 
-        return tempsize; 
-    }
-    
+            tempsize += returnSize( *it );
+        return tempsize;
+    }
+
     template <class T> inline void saveAndIncrease(  const std::set<T>& variable, uint8_t*& mem )
     {
@@ -654,5 +654,5 @@
             saveAndIncrease( *it, mem );
     }
-    
+
     template <class T> inline void loadAndIncrease( const std::set<T>& variable, uint8_t*& mem )
     {
@@ -675,5 +675,5 @@
         }
     }
-    
+
     template <class T> inline bool checkEquality( const std::set<T>& variable, uint8_t* mem )
     {
Index: /code/branches/presentation3/src/modules/designtools/CreateStars.h
===================================================================
--- /code/branches/presentation3/src/modules/designtools/CreateStars.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/designtools/CreateStars.h	(revision 7127)
@@ -32,5 +32,5 @@
 #include "util/Math.h"
 #include "core/BaseObject.h"
- 
+
 namespace orxonox
 {
@@ -61,9 +61,9 @@
             }
 
-            void setColour(const orxonox::ColourValue& colour) { 
+            void setColour(const orxonox::ColourValue& colour) {
                 this->colour_ = colour;
             }
 
-            const ColourValue& getColour() const { 
+            const ColourValue& getColour() const {
                 return this->colour_;
             }
@@ -109,5 +109,5 @@
                 return this->radius_;
             }
-            
+
             Vector3 PolarToCartesian(float alpha, float beta, float radius);
 
@@ -119,8 +119,8 @@
             unsigned int radius_;
             float alpha_;
-            float colourDiff_; 
+            float colourDiff_;
             float alphaDiff_;
             float radiusDiff_;
-            
+
     };
 }
Index: /code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc
===================================================================
--- /code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc	(revision 7127)
@@ -46,5 +46,5 @@
 
 
- 
+
 namespace orxonox
 {
@@ -68,5 +68,5 @@
     }
 
-    void SkyboxGenerator::setConfigValues( ) 
+    void SkyboxGenerator::setConfigValues( )
     {
         SetConfigValue(skyboxPrefix_, "SkyboxFile_");
@@ -83,13 +83,13 @@
                 return;
             }
-            
+
             ControllableEntity* ce = HumanController::getLocalControllerSingleton()->getControllableEntity();
             Camera* camera = ce->getCamera();
             assert(ce);
-        
+
             Ogre::RenderWindow* w = GraphicsManager::getInstance().getRenderWindow();
 
 
-            switch (iterateOverDirections_) 
+            switch (iterateOverDirections_)
             {
             case 0 :
@@ -105,8 +105,8 @@
                 iterateOverDirections_++;
                 break;
-                
+
             case 2 :
                 w->writeContentsToFile(skyboxPrefix_+"lf.png");
-                ce->yaw(Degree(90)); 
+                ce->yaw(Degree(90));
                 iterateOverDirections_++;
                 break;
@@ -114,5 +114,5 @@
             case 3 :
                 w->writeContentsToFile(skyboxPrefix_+"bk.png");
-                ce->yaw(Degree(90)); 
+                ce->yaw(Degree(90));
                 iterateOverDirections_++;
                 break;
@@ -120,6 +120,6 @@
             case 4 :
                 w->writeContentsToFile(skyboxPrefix_+"rt.png");
-                ce->yaw(Degree(90)); 
-                ce->pitch(Degree(90)); 
+                ce->yaw(Degree(90));
+                ce->pitch(Degree(90));
                 iterateOverDirections_++;
                 break;
@@ -127,5 +127,5 @@
             case 5 :
                 w->writeContentsToFile(skyboxPrefix_+"up.png");
-                ce->pitch(Degree(180)); 
+                ce->pitch(Degree(180));
                 iterateOverDirections_++;
                 break;
@@ -136,5 +136,5 @@
                 iterateOverDirections_++;
                 break;
-                
+
             case 7 :
                 camera->getOgreCamera()->setAspectRatio(aspectRatio_);
@@ -152,5 +152,5 @@
     }
 
-    void SkyboxGenerator::createSkybox( ) 
+    void SkyboxGenerator::createSkybox( )
     {
         SkyboxGenerator::getInstance().takeScreenshot_ = true;
Index: /code/branches/presentation3/src/modules/designtools/SkyboxGenerator.h
===================================================================
--- /code/branches/presentation3/src/modules/designtools/SkyboxGenerator.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/designtools/SkyboxGenerator.h	(revision 7127)
@@ -32,6 +32,6 @@
 #include "tools/interfaces/Tickable.h"
 #include <OgreMath.h>
- 
- 
+
+
 namespace orxonox
 {
@@ -39,5 +39,5 @@
     {
         friend class Singleton<SkyboxGenerator>;
-    
+
         public:
             SkyboxGenerator();
@@ -49,5 +49,5 @@
         private:
             static SkyboxGenerator* singletonPtr_s;
-            std::string skyboxPrefix_; 
+            std::string skyboxPrefix_;
             bool takeScreenshot_;
             int iterateOverDirections_;
Index: /code/branches/presentation3/src/modules/objects/Planet.cc
===================================================================
--- /code/branches/presentation3/src/modules/objects/Planet.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/Planet.cc	(revision 7127)
@@ -105,7 +105,7 @@
                 this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
                 this->mesh_.setVisible(this->isVisible());
-                
+
                 float scaleFactor = this->getScale();
-                
+
     #if OGRE_VERSION >= 0x010700
                 Ogre::Mesh::LodValueList distList;
@@ -113,5 +113,5 @@
                 Ogre::Mesh::LodDistanceList distList;
     #endif
-                
+
                 distList.push_back(10.0f*scaleFactor);
                 distList.push_back(19.0f*scaleFactor);
@@ -124,10 +124,10 @@
                 distList.push_back(54.0f*scaleFactor);
                 distList.push_back(55.0f*scaleFactor);
-                
+
                 float reductionValue = 0.2f;
-                
+
                 this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
                 billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
-                
+
                 this->attachOgreObject(this->billboard_.getBillboardSet());
                 this->billboard_.getBillboardSet()->setUseAccurateFacing(true);
Index: /code/branches/presentation3/src/modules/objects/eventsystem/EventListener.cc
===================================================================
--- /code/branches/presentation3/src/modules/objects/eventsystem/EventListener.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/eventsystem/EventListener.cc	(revision 7127)
@@ -61,5 +61,5 @@
             return;
         }
-        
+
         COUT(4) << "EventListener, processing event: originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << ")" << ", activate: " << event.activate_ << ", name: " << event.name_ << std::endl;
 
Index: /code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc	(revision 7127)
@@ -38,5 +38,5 @@
     CreateFactory(CheckPoint);
 
-    CheckPoint::CheckPoint(BaseObject* creator) 
+    CheckPoint::CheckPoint(BaseObject* creator)
         : DistanceTrigger(creator)
         , RadarViewable(creator, static_cast<WorldEntity*>(this))
Index: /code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.cc
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.cc	(revision 7127)
@@ -40,15 +40,15 @@
 namespace orxonox
 {
-    
+
     CreateFactory(DistanceMultiTrigger);
 
     /**
     @brief
-        Default Constructor. Registers the object and initializes default values. 
+        Default Constructor. Registers the object and initializes default values.
     */
     DistanceMultiTrigger::DistanceMultiTrigger(BaseObject* creator) : MultiTrigger(creator)
     {
         RegisterObject(DistanceMultiTrigger);
-        
+
         this->distance_ = 100.0f;
         this->targetName_ = BLANKSTRING;
@@ -98,5 +98,5 @@
                 continue;
             }
-            
+
             Vector3 distanceVec = entity->getWorldPosition() - this->getWorldPosition();
             // If the object is no longer in range.
@@ -154,5 +154,5 @@
                 if(this->singleTargetMode_)
                     entity = entity->getParent();
-                
+
                 // If no queue has been created, yet.
                 if(queue == NULL)
@@ -166,7 +166,7 @@
             }
         }
-        
+
         return queue;
     }
-    
+
 }
Index: /code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.h
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.h	(revision 7127)
@@ -56,9 +56,9 @@
     class _ObjectsExport DistanceMultiTrigger : public MultiTrigger
     {
-        
+
         public:
             DistanceMultiTrigger(BaseObject* creator); //!< Default Constructor. Registers the object and initializes default values.
             ~DistanceMultiTrigger(); //!< Destructor.
-            
+
             void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a DistanceMultiTrigger object through XML.
 
@@ -75,5 +75,5 @@
             inline const std::string& getTargetName(void)
                 { return this->targetName_; }
-            
+
             /**
             @brief Set the distance at which the DistanceMultiTrigger triggers.
@@ -88,5 +88,5 @@
             inline float getDistance() const
                 { return this->distance_; }
-                
+
         protected:
             virtual std::queue<MultiTriggerState*>* letTrigger(void); //!< This method is called by the MultiTrigger to get information about new trigger events that need to be looked at.
@@ -106,14 +106,14 @@
             inline bool removeFromRange(WorldEntity* entity)
                 { WeakPtr<WorldEntity>* weakptr = this->range_.find(entity)->second; bool erased = this->range_.erase(entity) > 0; if(erased) delete weakptr; return erased; }
-                
+
         private:
             float distance_; //!< The distance at which the DistanceMultiTrigger triggers.
             std::string targetName_; //!< The target name, used in singleTargetMode.
             bool singleTargetMode_; //!< To indicate whe the MultiDistanceTrigger is in single-target-mode.
-            
+
             std::map<WorldEntity*, WeakPtr<WorldEntity>* > range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.
-        
+
     };
-    
+
 }
 
Index: /code/branches/presentation3/src/modules/objects/triggers/DistanceTrigger.cc
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/DistanceTrigger.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/DistanceTrigger.cc	(revision 7127)
@@ -136,5 +136,5 @@
           continue;
       }
-      
+
       Vector3 distanceVec = entity->getWorldPosition() - this->getWorldPosition();
       if (distanceVec.length() < this->distance_)
Index: /code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.cc
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.cc	(revision 7127)
@@ -35,9 +35,9 @@
 
     CreateFactory(DistanceTriggerBeacon);
-    
+
     DistanceTriggerBeacon::DistanceTriggerBeacon(BaseObject* creator) : StaticEntity(creator)
     {
         RegisterObject(DistanceTriggerBeacon);
     }
-    
+
 }
Index: /code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.h
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.h	(revision 7127)
@@ -39,5 +39,5 @@
     class _ObjectsExport DistanceTriggerBeacon : public StaticEntity
     {
-        
+
         public:
 
Index: /code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.cc
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.cc	(revision 7127)
@@ -52,5 +52,5 @@
     EventMultiTrigger::~EventMultiTrigger()
     {
-        
+
     }
 
@@ -61,5 +61,5 @@
         this->setBroadcast(true);
     }
-    
+
     void EventMultiTrigger::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
     {
Index: /code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.h
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.h	(revision 7127)
@@ -44,5 +44,5 @@
     class _ObjectsExport EventMultiTrigger : public MultiTrigger
     {
-        
+
         public:
             EventMultiTrigger(BaseObject* creator);
Index: /code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.cc
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.cc	(revision 7127)
@@ -47,5 +47,5 @@
     /*static*/ const std::string MultiTrigger::or_s = "or";
     /*static*/ const std::string MultiTrigger::xor_s = "xor";
-    
+
     CreateFactory(MultiTrigger);
 
@@ -65,5 +65,5 @@
         this->bSwitch_ = false;
         this->bStayActive_ = false;
-        
+
         this->remainingActivations_ = INF_s;
         this->maxNumSimultaniousTriggerers_ = INF_s;
@@ -75,10 +75,10 @@
 
         this->parentTrigger_ = NULL;
-        
+
         this->targetMask_.exclude(Class(BaseObject));
 
         this->setSyncMode(0x0);
     }
-    
+
     /**
     @brief
@@ -95,5 +95,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -117,8 +117,8 @@
         //TODO: Maybe nicer with explicit subgroup, e.g. triggers
         XMLPortObject(MultiTrigger, MultiTrigger, "", addTrigger, getTrigger, xmlelement, mode);
-        
+
         COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") created." << std::endl;
     }
-    
+
 
     /**
@@ -131,5 +131,5 @@
     {
         // If this is the first tick.
-        //TODO: Determine need for this, else kick it out. 
+        //TODO: Determine need for this, else kick it out.
         if(this->bFirstTick_)
         {
@@ -174,5 +174,5 @@
                     delete state;
                 }
-                
+
                 queue->pop();
             }
@@ -185,5 +185,5 @@
             MultiTriggerState* state;
             float timeRemaining;
-            
+
             // Go through all pending states.
             for(int size = this->stateQueue_.size(); size >= 1; size--)
@@ -212,5 +212,5 @@
                                 this->triggered_.erase(state->originator);
                             }
-                            
+
                             bStateChanged = true;
                         }
@@ -229,5 +229,5 @@
 
                             bool bFire = true;
-                            
+
                             // Add the originator to the objects activating this MultiTrigger.
                             if(bActive == true)
@@ -266,5 +266,5 @@
                                 else
                                     this->fire(bActive, state->originator);
-                                
+
                                 bStateChanged = true;
                             }
@@ -289,5 +289,5 @@
                         }
                     }
-                    
+
                     // Remove the state from the state queue.
                     this->stateQueue_.pop_front();
@@ -509,8 +509,8 @@
             return returnVal;
         }
-        
+
         return true;
     }
-    
+
     /**
     @brief
@@ -547,5 +547,5 @@
             return;
         }
-        
+
         MultiTriggerContainer* container = new MultiTriggerContainer(this, this, originator);
         this->fireEvent(status, container);
@@ -563,5 +563,5 @@
     {
         ClassTreeMask& targetMask = this->getTargetMask();
-        
+
         for(ClassTreeMaskObjectIterator it = targetMask.begin(); it != targetMask.end(); ++it)
         {
@@ -580,9 +580,9 @@
     {
         assert(state);
-        
+
         // If the originator is no target of this MultiTrigger.
         if(!this->isTarget(state->originator))
             return false;
-        
+
         // Add it ot the state queue.
         this->stateQueue_.push_back(std::pair<float, MultiTriggerState*>(this->delay_, state));
Index: /code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.h
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.h	(revision 7127)
@@ -94,8 +94,8 @@
             MultiTrigger(BaseObject* creator); //!< Constructor. Registers the objects and initializes default values.
             ~MultiTrigger(); //!< Destructor.
-            
+
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a MultiTrigger object through XML.
             virtual void tick(float dt); //!< A method that is executed each tick.
-            
+
             bool isActive(BaseObject* triggerer = NULL); //!< Get whether the MultiTrigger is active for a given object.
 
@@ -215,13 +215,13 @@
             void addTargets(const std::string& targets); //!< Add some target to the MultiTrigger.
             void removeTargets(const std::string& targets); //!< Remove some target from the MultiTrigger.
-            
+
             void addTrigger(MultiTrigger* trigger); //!< Adds a MultiTrigger as a sub-trigger to the trigger.
             const MultiTrigger* getTrigger(unsigned int index) const; //!< Get the sub-trigger of this MultiTrigger at the given index.
-            
+
         protected:
             virtual std::queue<MultiTriggerState*>* letTrigger(void); //!< This method is called by the MultiTrigger to get information about new trigger events that need to be looked at.
 
             void changeTriggered(BaseObject* originator = NULL); //!< This method can be called by any class inheriting from MultiTrigger to change it's triggered status for a specified originator.
-            
+
             bool isModeTriggered(BaseObject* triggerer = NULL); //!< Checks whetherx the MultiTrigger is triggered concerning it's sub-triggers.
             bool isTriggered(BaseObject* triggerer = NULL); //!< Get whether the MultiTrigger is triggered for a given object.
@@ -236,5 +236,5 @@
             inline void addParentTrigger(MultiTrigger* parent)
                 { this->parentTrigger_ = parent; }
-            
+
             /**
             @brief Get the target mask used to identify the targets of this MultiTrigger.
@@ -248,5 +248,5 @@
             //TODO: Check if something mus be done here.
             virtual void notifyMaskUpdate(void) {}
-            
+
         private:
             static const int INF_s; //!< Magic number for infinity.
@@ -257,7 +257,7 @@
 
             void subTrigggerActivityChanged(BaseObject* originator); //!< This method is called by any sub-trigger to advertise changes in it's state to it's parent-trigger.
-            
+
             bool addState(MultiTriggerState* state); //!< Helper method. Adds a state to the state queue, where the state will wait to become active.
-            
+
             bool checkAnd(BaseObject* triggerer); //!< Checks whether the sub-triggers amount to true for the 'and' mode for a given object.
             bool checkOr(BaseObject* triggerer); //!< Checks whether the sub-triggers amount to true for the 'or' mode for a given object.
@@ -276,5 +276,5 @@
             bool bSwitch_; //!< Bool for the switch-mode, if true the MultiTrigger behaves like a switch.
             bool bStayActive_; //!< Bool for the stay-active-mode, if true the MultiTrigger stays active after its last activation.;
-            
+
             int remainingActivations_; //!< The remaining activations of this MultiTrigger.
             int maxNumSimultaniousTriggerers_; //!< The maximum number of objects simultaniously trigggering this MultiTrigger.
@@ -287,12 +287,12 @@
             MultiTrigger* parentTrigger_;
             std::set<MultiTrigger*> subTriggers_; //!< The sub-triggers of this MultiTrigger.
-            
+
             std::set<BaseObject*> active_; //!< The set of all objects the MultiTrigger is active for.
             std::set<BaseObject*> triggered_; //!< The set of all objects the MultiTrigger is triggered for.
 
             std::deque< std::pair<float, MultiTriggerState*> > stateQueue_; //!< The queue of states waiting to become active.
-            
+
             ClassTreeMask targetMask_; //!< The target mask, masking all objects that can trigger this MultiTrigger.
-            
+
     };
 
Index: /code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.cc
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.cc	(revision 7127)
@@ -40,5 +40,5 @@
 
     CreateUnloadableFactory(MultiTriggerContainer);
-    
+
     /**
     @brief
@@ -73,5 +73,5 @@
     MultiTriggerContainer::~MultiTriggerContainer()
     {
-        
+
     }
 
Index: /code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.h
===================================================================
--- /code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.h	(revision 7127)
@@ -50,5 +50,5 @@
     class _ObjectsExport MultiTriggerContainer : public BaseObject
     {
-        
+
         public:
             MultiTriggerContainer(BaseObject* creator); //!< Default constructor. Registers the object and creates an empty container.
@@ -68,10 +68,10 @@
             inline BaseObject* getData(void)
                 { return this->data_; }
-            
+
         private:
             MultiTrigger* originator_; //!< The originator.
             BaseObject* data_; //!< The data.
     };
-    
+
 }
 
Index: /code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h
===================================================================
--- /code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h	(revision 7127)
@@ -46,5 +46,5 @@
 
             void fadingmessage(const GametypeInfo* gtinfo, const std::string& message);
-                  
+
         private:
             PlayerInfo* owner_;
Index: /code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc
===================================================================
--- /code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc	(revision 7127)
@@ -37,6 +37,6 @@
 {
     CreateFactory(GametypeStaticMessage);
-    
-    
+
+
     GametypeStaticMessage::GametypeStaticMessage(BaseObject* creator) : OverlayText(creator)
     {
Index: /code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h
===================================================================
--- /code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h	(revision 7127)
@@ -49,5 +49,5 @@
 
             void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour);
-            
+
         private:
             PlayerInfo* owner_;
Index: /code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc
===================================================================
--- /code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc	(revision 7127)
@@ -39,7 +39,7 @@
 namespace orxonox
 {
-    CreateFactory(GametypeStatus);  
+    CreateFactory(GametypeStatus);
 
-    /*static*/ bool GametypeStatus::noCaption_s = false; 
+    /*static*/ bool GametypeStatus::noCaption_s = false;
     SetConsoleCommand(GametypeStatus, setGametypeStatus, true);
 
@@ -109,4 +109,4 @@
         GametypeStatus::noCaption_s = !bValue;
     }
-    
+
 }
Index: /code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h
===================================================================
--- /code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h	(revision 7127)
@@ -51,5 +51,5 @@
             PlayerInfo* owner_;
             static bool noCaption_s;
-            
+
     };
 }
Index: /code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- /code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc	(revision 7127)
@@ -402,5 +402,5 @@
 void HUDNavigation::changedOwner()
 {
-    
+
     const std::set<RadarViewable*>& respawnObjects = this->getOwner()->getScene()->getRadar()->getRadarObjects();
     for ( std::set<RadarViewable*>::const_iterator it = respawnObjects.begin(); it != respawnObjects.end(); ++it )
Index: /code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- /code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h	(revision 7127)
@@ -50,5 +50,5 @@
 
     void setConfigValues();
-    
+
     virtual void XMLPort ( Element& xmlElement, XMLPort::Mode mode );
     virtual void tick ( float dt );
@@ -76,5 +76,5 @@
 
     };
-    
+
     bool showObject( RadarViewable* rv );
 
Index: /code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- /code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc	(revision 7127)
@@ -45,5 +45,5 @@
 namespace orxonox
 {
-    CreateFactory(HUDRadar); 
+    CreateFactory(HUDRadar);
 
     HUDRadar::HUDRadar(BaseObject* creator)
Index: /code/branches/presentation3/src/modules/overlays/hud/HUDRadar.h
===================================================================
--- /code/branches/presentation3/src/modules/overlays/hud/HUDRadar.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/overlays/hud/HUDRadar.h	(revision 7127)
@@ -69,5 +69,5 @@
         virtual void objectChanged( RadarViewable* rv );
         void radarTick(float dt);
-        
+
         void gatherObjects();
 
Index: /code/branches/presentation3/src/modules/pickup/DroppedPickup.cc
===================================================================
--- /code/branches/presentation3/src/modules/pickup/DroppedPickup.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/DroppedPickup.cc	(revision 7127)
@@ -41,7 +41,7 @@
 namespace orxonox
 {
-    
+
     CreateFactory(DroppedPickup);
-    
+
     /**
     @brief
@@ -51,5 +51,5 @@
     {
         RegisterObject(DroppedPickup);
-        
+
     }
 
@@ -67,10 +67,10 @@
     */
     DroppedPickup::DroppedPickup(BaseObject* creator, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance) : PickupSpawner(creator, pickup, triggerDistance, 5, 1)
-    {   
+    {
         RegisterObject(DroppedPickup);
 
         this->setPosition(carrier->getCarrierPosition());
         this->setActive(false);
-        
+
         //TODO: Do more elegantly.
         this->startRespawnTimer();
Index: /code/branches/presentation3/src/modules/pickup/DroppedPickup.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/DroppedPickup.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/DroppedPickup.h	(revision 7127)
@@ -41,5 +41,5 @@
 namespace orxonox
 {
-    
+
     /**
     @brief
Index: /code/branches/presentation3/src/modules/pickup/Pickup.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/Pickup.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/Pickup.h	(revision 7127)
@@ -165,5 +165,5 @@
         private:
             void initialize(void); //!< Initializes the member variables.
-            
+
             //TODO: Problems, when there are more Timers needed? Solutions?
             Timer durationTimer_; //!< Timer at the disposal of each Class implementing Pickup.
Index: /code/branches/presentation3/src/modules/pickup/PickupCollection.cc
===================================================================
--- /code/branches/presentation3/src/modules/pickup/PickupCollection.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/PickupCollection.cc	(revision 7127)
@@ -42,5 +42,5 @@
 namespace orxonox
 {
- 
+
     CreateFactory(PickupCollection);
 
@@ -52,8 +52,8 @@
     {
         RegisterObject(PickupCollection);
-        
+
         this->pickupCollectionIdentifier_ = new PickupCollectionIdentifier(this);
     }
-    
+
     /**
     @brief
@@ -69,5 +69,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -77,10 +77,10 @@
     {
         SUPER(PickupCollection, XMLPort, xmlelement, mode);
-        
+
         XMLPortObject(PickupCollection, Pickupable, "pickupables", addPickupable, getPickupable, xmlelement, mode);
-        
+
         this->initializeIdentifier();
     }
-    
+
     /**
     @brief
@@ -94,5 +94,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -103,5 +103,5 @@
     {
         SUPER(PickupCollection, changedUsed);
-        
+
         //! Change used for all Pickupables this PickupCollection consists of.
         for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
@@ -110,5 +110,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -119,5 +119,5 @@
     {
         SUPER(PickupCollection, changedCarrier);
-        
+
         //! Change the PickupCarrier for all Pickupables this PickupCollection consists of.
         for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
@@ -126,5 +126,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -135,5 +135,5 @@
     {
         SUPER(PickupCollection, changedPickedUp);
-        
+
         //! Change the pickedUp status for all Pickupables this PickupCollection consists of.
         for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
@@ -142,5 +142,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -154,7 +154,7 @@
         if(item == NULL)
             item = new PickupCollection(this);
-        
+
         SUPER(PickupCollection, clone, item);
-        
+
         PickupCollection* pickup = dynamic_cast<PickupCollection*>(item);
         //! Clone all Pickupables this PickupCollection consist of.
@@ -167,5 +167,5 @@
         pickup->initializeIdentifier();
     }
-    
+
     /**
     @brief
@@ -183,8 +183,8 @@
                 return false;
         }
-        
+
         return true;
     }
-    
+
     /**
     @brief
@@ -198,5 +198,5 @@
         return this->pickupCollectionIdentifier_;
     }
-    
+
     /**
     @brief
@@ -211,10 +211,10 @@
         if(pickup == NULL)
             return false;
-        
+
         WeakPtr<Pickupable> ptr = pickup; //!< Create a weak pointer to be able to test in the constructor if the Pointer is still valid.
         this->pickups_.push_back(ptr);
         return true;
     }
-    
+
     /**
     @brief
@@ -229,5 +229,5 @@
         return this->pickups_[index].get();
     }
-        
+
     /**
     @brief
@@ -245,4 +245,4 @@
         return true;
     }
-    
+
 }
Index: /code/branches/presentation3/src/modules/pickup/PickupCollection.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/PickupCollection.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/PickupCollection.h	(revision 7127)
@@ -53,10 +53,10 @@
     class _PickupExport PickupCollection : public Pickupable, public BaseObject
     {
-        
+
         public:
-            
+
             PickupCollection(BaseObject* creator); //!< Default Constructor.
             virtual ~PickupCollection(); //!< Destructor.
-            
+
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates an instance of this Class through XML.
 
@@ -64,27 +64,27 @@
             virtual void changedCarrier(void); //!< Is called when the pickup has changed its PickupCarrier.
             virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
-            
+
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-            
+
             virtual bool isTarget(PickupCarrier* carrier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
-            
+
             virtual const PickupIdentifier* getPickupIdentifier(void); //!< Get the PickupIdentifier of this PickupCollection.
-            
+
             bool addPickupable(Pickupable* pickup); //!< Add the input Pickupable to list of Pickupables combined by this PickupCollection.
             const Pickupable* getPickupable(unsigned int index); //!< Get the Pickupable at the given index.
-            
+
         protected:
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier for this pickup.
-            
+
             virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
-            
+
             PickupCollectionIdentifier* pickupCollectionIdentifier_; //!< The PickupCollectionIdentifier of this PickupCollection. Is used to distinguish different PickupCollections amongst themselves.
-            
+
         private:
-            
+
             std::vector<WeakPtr<Pickupable> > pickups_; //!< The list of the pointers of all the Pickupables this PickupCollection consists of. They are weak pointers to facilitate testing, whether the pointers are still valid.
-        
+
     };
-    
+
 }
 
Index: /code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.cc
===================================================================
--- /code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.cc	(revision 7127)
@@ -38,5 +38,5 @@
 namespace orxonox
 {
-    
+
     /**
     @brief
@@ -47,5 +47,5 @@
         RegisterObject(PickupCollectionIdentifier);
     }
-    
+
     /**
     @brief
@@ -54,5 +54,5 @@
     PickupCollectionIdentifier::~PickupCollectionIdentifier()
     {
-        
+
     }
 
@@ -70,5 +70,5 @@
         PickupIdentifier* temp = const_cast<PickupIdentifier*>(identifier);
         const PickupCollectionIdentifier* collectionIdentifier = dynamic_cast<PickupCollectionIdentifier*>(temp);
-        
+
         //! If the input PickupIdentifier 'identifier' is no PickupCollectionIdentifier then just the two PickupIdentifiers are compared.
         if(collectionIdentifier == NULL)
@@ -76,14 +76,14 @@
             return this->PickupIdentifier::compare(identifier);
         }
-        
+
         //! If the number of Pickupables each of the two PickupCollectionIdentifiers contain differ, the one with less is considered smaller.
         if(this->identifiers_.size() != collectionIdentifier->identifiers_.size())
             return this->identifiers_.size()-collectionIdentifier->identifiers_.size();
-        
+
         //! Compare the Pickupables of the two PickupCollectionIdentifiers one after the other. the one with the first 'smaller' one is considered smaller.
         std::set<const PickupIdentifier*, PickupIdentifierCompare>::const_iterator it2 = collectionIdentifier->identifiers_.begin();
         for(std::set<const PickupIdentifier*, PickupIdentifierCompare>::const_iterator it = this->identifiers_.begin(); it != this->identifiers_.end(); it++)
         {
-            
+
             if((*it)->compare(*it2) < 0)
                 return -1;
@@ -91,9 +91,9 @@
                 return 1;
         }
-        
+
         //! Means they are equal.
         return 0;
     }
-    
+
     /**
     @brief
@@ -106,5 +106,5 @@
         this->identifiers_.insert(identifier);
     }
-    
+
 }
 
Index: /code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.h	(revision 7127)
@@ -54,18 +54,18 @@
     class _PickupExport PickupCollectionIdentifier : public PickupIdentifier
     {
-        
+
         public:
             PickupCollectionIdentifier(Pickupable* pickup); //!< Constructor.
             ~PickupCollectionIdentifier(); //!< Destructor.
-            
+
             virtual int compare(const PickupIdentifier* identifier) const; //!< Compares a PickupCollectionIdentifier with a PickupIdentifier.
-            
+
             void addPickup(const PickupIdentifier* identifier); //!< Add a Pickupable to the PickupCollectionIdentifier.
-            
+
         private:
             std::set<const PickupIdentifier*, PickupIdentifierCompare> identifiers_; //!< The set of PickupIdentifiers of the Pickupables the PickupCollection with this PickupCollectionIdentifier consists of, ordered by the rule set by PickupIdentifierCompare.
-            
+
     };
-    
+
 }
 
Index: /code/branches/presentation3/src/modules/pickup/PickupManager.cc
===================================================================
--- /code/branches/presentation3/src/modules/pickup/PickupManager.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/PickupManager.cc	(revision 7127)
@@ -51,9 +51,9 @@
     // Register tolua_open function when loading the library
     DeclareToluaInterface(Pickup);
-    
+
     ManageScopedSingleton(PickupManager, ScopeID::Root, false);
-    
+
     /*static*/ const std::string PickupManager::guiName_s = "PickupInventory";
-    
+
     /**
     @brief
@@ -69,8 +69,8 @@
         }
         this->defaultRepresentation_ = new PickupRepresentation();
-        
+
         COUT(3) << "PickupManager created." << std::endl;
     }
-    
+
     /**
     @brief
@@ -82,10 +82,10 @@
         if(this->defaultRepresentation_ != NULL)
             this->defaultRepresentation_->destroy();
-        
+
         this->representations_.clear();
-        
+
         COUT(3) << "PickupManager destroyed." << std::endl;
     }
-    
+
     /**
     @brief
@@ -100,14 +100,14 @@
     */
     bool PickupManager::registerRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation)
-    {       
+    {
         if(identifier == NULL || representation == NULL || this->representations_.find(identifier) != this->representations_.end()) //!< If the Pickupable already has a Representation registered.
             return false;
-        
+
         this->representations_[identifier] = representation;
-        
+
         COUT(4) << "PickupRepresentation " << representation << " registered with the PickupManager." << std::endl;
         return true;
     }
-    
+
     /**
     @brief
@@ -121,18 +121,18 @@
     */
     bool PickupManager::unregisterRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation)
-    {       
+    {
         if(identifier == NULL || representation == NULL)
             return false;
-        
+
         std::map<const PickupIdentifier*, PickupRepresentation*, PickupIdentifierCompare>::iterator it = this->representations_.find(identifier);
         if(it == this->representations_.end()) //!< If the Pickupable is not registered in the first place.
             return false;
-        
+
         this->representations_.erase(it);
-        
+
         COUT(4) << "PickupRepresentation " << representation << " unregistered with the PickupManager." << std::endl;
         return true;
     }
-    
+
     /**
     @brief
@@ -151,5 +151,5 @@
             return this->defaultRepresentation_;
         }
-        
+
         return it->second;
     }
@@ -158,5 +158,5 @@
     {
         this->pickupsList_.clear();
-        
+
         PlayerInfo* player = GUIManager::getInstance().getPlayer(PickupManager::guiName_s);
         PickupCarrier* carrier = NULL;
@@ -221,5 +221,5 @@
         if(pickup == NULL || it == this->pickupsList_.end() || it->second.get() == NULL)
             return;
-        
+
         if(!pickup->isPickedUp())
             return;
@@ -229,4 +229,4 @@
             pickup->setUsed(use);
     }
-    
+
 }
Index: /code/branches/presentation3/src/modules/pickup/PickupManager.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/PickupManager.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/PickupManager.h	(revision 7127)
@@ -60,15 +60,15 @@
     { // tolua_export
         friend class Singleton<PickupManager>;
-        
+
         public:
             PickupManager();
             virtual ~PickupManager();
-            
+
             static PickupManager& getInstance() { return Singleton<PickupManager>::getInstance(); } // tolua_export
-            
+
             bool registerRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation); //!< Registers a PickupRepresentation together with the PickupIdentifier of the Pickupable the PickupRepresentation represents.
             bool unregisterRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation); //!< Unegisters a PickupRepresentation together with the PickupIdentifier of the Pickupable the PickupRepresentation represents.
             PickupRepresentation* getRepresentation(const PickupIdentifier* identifier); //!< Get the PickupRepresentation representing the Pickupable with the input PickupIdentifier.
-            
+
             // tolua_begin
             int getNumPickups(void);
@@ -80,9 +80,9 @@
             bool isValidPickup(orxonox::Pickupable* pickup) { std::map<Pickupable*, WeakPtr<Pickupable> >::iterator it = this->pickupsList_.find(pickup); if(it == this->pickupsList_.end()) return false; return it->second.get() != NULL; }
             // tolua_end
-            
+
         private:
             static PickupManager* singletonPtr_s;
             static const std::string guiName_s;
-            
+
             PickupRepresentation* defaultRepresentation_; //!< The default PickupRepresentation.
             std::map<const PickupIdentifier*, PickupRepresentation*, PickupIdentifierCompare> representations_; //!< Map linking PickupIdentifiers (representing types if Pickupables) and PickupRepresentations.
@@ -92,7 +92,7 @@
 
             std::vector<PickupCarrier*>* getAllCarriers(PickupCarrier* carrier);
-        
+
     }; // tolua_export
-    
+
 } // tolua_export
 
Index: /code/branches/presentation3/src/modules/pickup/PickupPrereqs.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/PickupPrereqs.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/PickupPrereqs.h	(revision 7127)
@@ -65,5 +65,5 @@
 namespace orxonox
 {
-    
+
     class DroppedPickup;
     class Pickup;
Index: /code/branches/presentation3/src/modules/pickup/PickupRepresentation.cc
===================================================================
--- /code/branches/presentation3/src/modules/pickup/PickupRepresentation.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/PickupRepresentation.cc	(revision 7127)
@@ -41,7 +41,7 @@
 namespace orxonox
 {
-    
+
     CreateFactory(PickupRepresentation);
-    
+
     /**
     @brief
@@ -52,8 +52,8 @@
     {
         RegisterObject(PickupRepresentation);
-        
+
         this->initialize();
     }
-    
+
     /**
     @brief
@@ -63,8 +63,8 @@
     {
         RegisterObject(PickupRepresentation);
-        
+
         this->initialize();
     }
-    
+
     /**
     @brief
@@ -75,9 +75,9 @@
         if(this->spawnerRepresentation_ != NULL)
             this->spawnerRepresentation_->destroy();
-        
+
         if(this->pickup_ != NULL)
             PickupManager::getInstance().unregisterRepresentation(this->pickup_->getPickupIdentifier(), this);
     }
-    
+
     /**
     @brief
@@ -91,5 +91,5 @@
         this->inventoryRepresentation_ = "Default";
     }
-    
+
     /**
     @brief
@@ -99,5 +99,5 @@
     {
         SUPER(PickupRepresentation, XMLPort, xmlelement, mode);
-        
+
         XMLPortParam(PickupRepresentation, "pickupName", setPickupName, getPickupName, xmlelement, mode);
         XMLPortParam(PickupRepresentation, "pickupDescription", setPickupDescription, getPickupDescription, xmlelement, mode);
@@ -106,13 +106,13 @@
         XMLPortObject(PickupRepresentation, Pickupable, "pickup", setPickup, getPickup, xmlelement, mode);
         XMLPortObject(PickupRepresentation, StaticEntity, "spawner-representation", setSpawnerRepresentation, getSpawnerRepresentationIndex, xmlelement, mode);
-        
+
         PickupManager::getInstance().registerRepresentation(this->pickup_->getPickupIdentifier(), this); //!< Registers the PickupRepresentation with the PickupManager through the PickupIdentifier of the Pickupable it represents.
-        
+
         if(this->spawnerRepresentation_ != NULL)
             this->spawnerRepresentation_->setVisible(false);
-        
+
         COUT(4) << "PickupRepresentation created: name: '" << this->name_ << "', description: '" << this->description_ << "', spawnerTemplate: '" << this->spawnerTemplate_ << "'." << std::endl;
     }
-    
+
     /**
     @brief
@@ -136,14 +136,14 @@
             this->addTemplate(this->spawnerTemplate_);
         }
-        
+
         StaticEntity* representation = this->spawnerRepresentation_;
         representation->setVisible(true);
-        
+
         this->addTemplate(this->spawnerTemplate_);
         this->spawnerRepresentation_->setVisible(false);
-        
+
         return representation;
     }
-    
+
     /**
     @brief
@@ -171,4 +171,4 @@
         return representation;
     }
-    
+
 }
Index: /code/branches/presentation3/src/modules/pickup/PickupRepresentation.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/PickupRepresentation.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/PickupRepresentation.h	(revision 7127)
@@ -56,12 +56,12 @@
         : public BaseObject
     { // tolua_export
-        
+
         public:
             PickupRepresentation(); //!< Constructor
             PickupRepresentation(BaseObject* creator); //!< Default constructor.
             virtual ~PickupRepresentation(); //!< Destructor.
-            
+
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            
+
             /**
             @brief Set the name of the Pickupable represented by this PickupRepresentation.
@@ -102,5 +102,5 @@
             inline void setPickup(Pickupable* pickup)
                 { this->pickup_ = pickup; }
-                
+
             /**
             @brief Get the name of the Pickupable represented by this PickupRepresentation.
@@ -138,11 +138,11 @@
             inline const Pickupable* getPickup(unsigned int index)
                 { if(index == 0) return this->pickup_; return NULL; }
-                
+
             StaticEntity* getSpawnerRepresentation(PickupSpawner* spawner); //!< Get a spawnerRepresentation for a specific PickupSpawner.
-        
+
         private:
             void initialize(void); //!< Initializes the member variables of this PickupRepresentation.
             StaticEntity* getDefaultSpawnerRepresentation(PickupSpawner* spawner); //!< Get the default spawnerRepresentation for a specific PickupSpawner.
-            
+
             std::string name_; //!< The name of the Pickupable represented by this PickupRepresentation.
             std::string description_; //!< The description of the Pickupable represented by this PickupRepresentation.
@@ -150,10 +150,10 @@
             StaticEntity* spawnerRepresentation_; //!< The spawnerRepresentation of this PickupRepresentation.
             std::string inventoryRepresentation_; //!< The name of an image representing the pickup in the PickupInventory. TODO: Exact format and placement of image?
-            
+
             Pickupable* pickup_; //!< The Pickupable that is represented by this PickupRepresentation.
-            
+
     }; // tolua_export
 
 } // tolua_export
-    
+
 #endif // _PickupRepresentation_H__
Index: /code/branches/presentation3/src/modules/pickup/PickupSpawner.cc
===================================================================
--- /code/branches/presentation3/src/modules/pickup/PickupSpawner.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/PickupSpawner.cc	(revision 7127)
@@ -55,5 +55,5 @@
     {
         RegisterObject(PickupSpawner);
-        
+
         this->initialize();
     }
@@ -76,7 +76,7 @@
     {
         RegisterObject(PickupSpawner);
-        
+
         this->initialize();
-  
+
         this->pickup_ = pickup;
 
@@ -84,5 +84,5 @@
         this->respawnTime_ = respawnTime;
         this->setMaxSpawnedItems(maxSpawnedItems);
-        
+
         if(this->pickup_ == NULL)
         {
@@ -132,9 +132,9 @@
 
         XMLPortObject(PickupSpawner, Pickupable, "pickup", setPickupable, getPickupable, xmlelement, mode);
-        
+
         XMLPortParam(PickupSpawner, "triggerDistance", setTriggerDistance, getTriggerDistance, xmlelement, mode);
         XMLPortParam(PickupSpawner, "respawnTime", setRespawnTime, getRespawnTime, xmlelement, mode);
         XMLPortParam(PickupSpawner, "maxSpawnedItems", setMaxSpawnedItems, getMaxSpawnedItems, xmlelement, mode);
-        
+
         if(this->pickup_ == NULL)
         {
@@ -150,5 +150,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -161,5 +161,5 @@
         this->setVisible(this->isActive());
     }
-     
+
     /**
     @brief
@@ -172,10 +172,10 @@
     {
         SUPER(PickupSpawner, tick, dt);
-        
+
         //! If the PickupSpawner is active.
         if (this->isActive())
         {
             SmartPtr<PickupSpawner> temp = this; // create a smart pointer to keep the PickupSpawner alive until we iterated through all Pawns (in case a Pawn takes the last pickup)
-            
+
             //! Iterate trough all Pawns.
             for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
@@ -191,5 +191,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -203,5 +203,5 @@
         this->spawnsRemaining_ = items;
     }
-    
+
     /**
     @brief
@@ -230,5 +230,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -239,5 +239,5 @@
         this->respawnTimer_.setTimer(this->respawnTime_, false, createExecutor(createFunctor(&PickupSpawner::respawnTimerCallback, this)));
     }
-    
+
     /**
     @brief
@@ -258,8 +258,8 @@
             return;
         }
-        
+
         this->pickup_ = pickup;
     }
-    
+
     /**
     @brief
@@ -285,5 +285,5 @@
         {
             COUT(4) << "PickupSpawner (&" << this << ") triggered and active." << std::endl;
-            
+
             PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);
             if(carrier == NULL)
@@ -292,5 +292,5 @@
                 return;
             }
-            
+
             if(!carrier->isTarget(this->pickup_))
             {
@@ -298,8 +298,8 @@
                 return;
             }
-            
+
             PickupCarrier* target = carrier->getTarget(this->pickup_);
             Pickupable* pickup = this->getPickup();
-            
+
             if(target != NULL && pickup != NULL)
             {
@@ -317,5 +317,5 @@
                 if(target == NULL)
                     COUT(1) << "PickupSpawner (&" << this << "): Pickupable has no target." << std::endl;
-                
+
                 if(pickup == NULL)
                 {
@@ -335,5 +335,5 @@
     @return
         The Pickupable created.
-    */    
+    */
     Pickupable* PickupSpawner::getPickup(void)
     {
@@ -343,5 +343,5 @@
             return NULL;
         }
-        
+
         Pickupable* pickup = this->pickup_->clone();
         return pickup;
Index: /code/branches/presentation3/src/modules/pickup/PickupSpawner.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/PickupSpawner.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/PickupSpawner.h	(revision 7127)
@@ -101,17 +101,17 @@
         protected:
             void decrementSpawnsRemaining(void); //!< Decrements the number of remaining spawns.
-                        
+
             void startRespawnTimer(void);
-            
+
             virtual Pickupable* getPickup(void); //!< Creates a new Pickupable.
-            
+
             void setPickupable(Pickupable* pickup); //!< Sets a Pickupable for the PickupSpawner to spawn.
             const Pickupable* getPickupable(void); //!< Get the Pickupable that is spawned by this PickupSpawner.
-            
+
             Pickupable* pickup_; //!< The pickup to be spawned.
 
         private:
             void initialize(void);
-            
+
             void trigger(Pawn* pawn); //!< Method called when a Pawn is close enough.
             void respawnTimerCallback(); //!< Method called when the timer runs out.
Index: /code/branches/presentation3/src/modules/pickup/items/DronePickup.cc
===================================================================
--- /code/branches/presentation3/src/modules/pickup/items/DronePickup.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/items/DronePickup.cc	(revision 7127)
@@ -49,5 +49,5 @@
 
     CreateFactory(DronePickup);
-    
+
     /**
     @brief
@@ -57,8 +57,8 @@
     {
         RegisterObject(DronePickup);
-        
+
         this->initialize();
     }
-    
+
     /**
     @brief
@@ -67,9 +67,9 @@
     DronePickup::~DronePickup()
     {
-        
+
     }
-    
+
     /**
-    @brief 
+    @brief
         Initializes the member variables.
     */
@@ -80,5 +80,5 @@
         this->droneTemplate_ = "";
     }
-    
+
     /**
     @brief
@@ -91,5 +91,5 @@
         this->pickupIdentifier_->addParameter(type, val);
     }
-    
+
     /**
     @brief
@@ -100,12 +100,12 @@
         SUPER(DronePickup, XMLPort, xmlelement, mode);
         XMLPortParam(DronePickup, "droneTemplate", setDroneTemplate, getDroneTemplate, xmlelement, mode);
-        
+
         this->initializeIdentifier();
     }
-    
+
     void DronePickup::setDroneTemplate(std::string templatename){
         droneTemplate_ = templatename;
-    } 
-    
+    }
+
     const std::string& DronePickup::getDroneTemplate() const
     {
@@ -120,9 +120,9 @@
     {
         SUPER(DronePickup, changedUsed);
-        
+
         //! If the pickup is not picked up nothing must be done.
         if(!this->isPickedUp())
             return;
-        
+
         //! If the pickup has transited to used.
         if(this->isUsed())
@@ -132,5 +132,5 @@
                 if(pawn == NULL) //!< If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                     this->destroy();
-                
+
                 //Attach to pawn
                 Drone* drone = new Drone(pawn->getCreator()); // this is neccessary because the projectiles fired need a valid creator for the particlespawner (when colliding against something)
@@ -143,8 +143,8 @@
                     droneController->setOwner(pawn);
                 }
-                
+
                 Vector3 spawnPosition = pawn->getWorldPosition() + Vector3(30,0,-30);
                 drone->setPosition(spawnPosition);
-                
+
                 //! The pickup has been used up.
                 this->setUsed(false);
@@ -159,5 +159,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -170,13 +170,13 @@
         PickupCarrier* carrier = this->getCarrier();
         Pawn* pawn = dynamic_cast<Pawn*>(carrier);
-        
+
         if(pawn == NULL)
         {
             COUT(1) << "Invalid PickupCarrier in DronePickup." << std::endl;
         }
-        
+
         return pawn;
     }
-    
+
     /**
     @brief
@@ -189,10 +189,10 @@
         if(item == NULL)
             item = new DronePickup(this);
-        
+
         SUPER(DronePickup, clone, item);
-        
+
         DronePickup* pickup = dynamic_cast<DronePickup*>(item);
         pickup->setDroneTemplate(this->getDroneTemplate());
-        
+
         pickup->initializeIdentifier();
     }
Index: /code/branches/presentation3/src/modules/pickup/items/DronePickup.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/items/DronePickup.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/items/DronePickup.h	(revision 7127)
@@ -47,31 +47,31 @@
 
 namespace orxonox {
-    
+
 
     class _PickupExport DronePickup : public Pickup, public Tickable
     {
         public:
-        
+
             DronePickup(BaseObject* creator); //!< Constructor.
             virtual ~DronePickup(); //!< Destructor.
-            
+
             virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a DronePickup object through XML.
-            
+
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
 
             void setDroneTemplate(std::string templatename);
-            const std::string& getDroneTemplate() const; 
-            
+            const std::string& getDroneTemplate() const;
+
         protected:
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
-        
+
         private:
             void initialize(void); //!< Initializes the member variables.
             std::string droneTemplate_;
             Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
-            
 
-        
+
+
     };
 }
Index: /code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc
===================================================================
--- /code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc	(revision 7127)
@@ -45,11 +45,11 @@
 namespace orxonox
 {
-    
+
     /*static*/ const std::string HealthPickup::healthTypeLimited_s = "limited";
     /*static*/ const std::string HealthPickup::healthTypeTemporary_s = "temporary";
     /*static*/ const std::string HealthPickup::healthTypePermanent_s = "permanent";
-    
+
     CreateFactory(HealthPickup);
-    
+
     /**
     @brief
@@ -59,8 +59,8 @@
     {
         RegisterObject(HealthPickup);
-        
+
         this->initialize();
     }
-    
+
     /**
     @brief
@@ -69,13 +69,13 @@
     HealthPickup::~HealthPickup()
     {
-        
-    }
-    
-    /**
-    @brief 
+
+    }
+
+    /**
+    @brief
         Initializes the member variables.
     */
     void HealthPickup::initialize(void)
-    {        
+    {
         this->health_ = 0;
         this->healthRate_ = 0;
@@ -83,8 +83,8 @@
         this->maxHealthSave_ = 0;
         this->maxHealthOverwrite_ = 0;
-        
+
         this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
     }
-    
+
     /**
     @brief
@@ -98,9 +98,9 @@
         std::string val1 = stream.str();
         this->pickupIdentifier_->addParameter(type1, val1);
-        
+
         std::string val2 = this->getHealthType();
         std::string type2 = "healthType";
         this->pickupIdentifier_->addParameter(type2, val2);
-        
+
         stream.clear();
         stream << this->getHealthRate();
@@ -109,5 +109,5 @@
         this->pickupIdentifier_->addParameter(type3, val3);
     }
-    
+
     /**
     @brief
@@ -117,15 +117,15 @@
     {
         SUPER(HealthPickup, XMLPort, xmlelement, mode);
-        
+
         XMLPortParam(HealthPickup, "health", setHealth, getHealth, xmlelement, mode);
         XMLPortParam(HealthPickup, "healthRate", setHealthRate, getHealthRate, xmlelement, mode);
         XMLPortParam(HealthPickup, "healthType", setHealthType, getHealthType, xmlelement, mode);
-        
+
         if(!this->isContinuous())
             this->healthRate_ = 0.0;
-        
+
         this->initializeIdentifier();
     }
-    
+
     /**
     @brief
@@ -138,5 +138,5 @@
     {
         SUPER(HealthPickup, tick, dt);
-        
+
         if(this->isContinuous() && this->isUsed())
         {
@@ -144,5 +144,5 @@
             if(pawn == NULL) //!< If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                 this->destroy();
-            
+
             //! Calculate the health that is added this tick.
             float health = dt*this->getHealthRate();
@@ -152,5 +152,5 @@
             float fullHealth = pawn->getHealth() + health;
             this->setHealth(this->getHealth()-health);
-                    
+
             switch(this->getHealthTypeDirect())
             {
@@ -173,5 +173,5 @@
                     COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
             }
-            
+
             //! If all health has been transfered.
             if(this->getHealth() == 0)
@@ -181,5 +181,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -193,5 +193,5 @@
         if(!this->isPickedUp())
             return;
-        
+
         //! If the pickup has transited to used.
         if(this->isUsed())
@@ -202,5 +202,5 @@
                 if(pawn == NULL) //!< If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                     this->destroy();
-                
+
                 float health = 0;
                 switch(this->getHealthTypeDirect())
@@ -226,5 +226,5 @@
                         COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
                 }
-                
+
                 //! The pickup has been used up.
                 this->setUsed(false);
@@ -237,5 +237,5 @@
                 PickupCarrier* carrier = this->getCarrier();
                 Pawn* pawn = dynamic_cast<Pawn*>(carrier);
-                
+
                 if(pawn == NULL)
                 {
@@ -244,5 +244,5 @@
                     return;
                 }
-                
+
                 if(pawn->getMaxHealth() == this->maxHealthOverwrite_)
                 {
@@ -252,5 +252,5 @@
                 }
             }
-            
+
             //! If either the pickup can only be used once or it is continuous and used up, it is destroyed upon setting it to unused.
             if(this->isOnce() || (this->isContinuous() && this->getHealth() == 0))
@@ -260,5 +260,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -271,13 +271,13 @@
         PickupCarrier* carrier = this->getCarrier();
         Pawn* pawn = dynamic_cast<Pawn*>(carrier);
-        
+
         if(pawn == NULL)
         {
             COUT(1) << "Invalid PickupCarrier in HealthPickup." << std::endl;
         }
-        
+
         return pawn;
     }
-    
+
     /**
     @brief
@@ -297,8 +297,8 @@
         pickup->setHealthRate(this->getHealthRate());
         pickup->setHealthTypeDirect(this->getHealthTypeDirect());
-        
+
         pickup->initializeIdentifier();
     }
-    
+
     /**
     @brief
@@ -322,5 +322,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -341,5 +341,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -356,8 +356,8 @@
         else
         {
-            COUT(1) << "Invalid healthSpeed in HealthPickup." << std::endl; 
-        }
-    }
-    
+            COUT(1) << "Invalid healthSpeed in HealthPickup." << std::endl;
+        }
+    }
+
     /**
     @brief
Index: /code/branches/presentation3/src/modules/pickup/items/HealthPickup.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/items/HealthPickup.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/items/HealthPickup.h	(revision 7127)
@@ -45,5 +45,5 @@
 
 namespace orxonox {
-    
+
     //! Enum for the type of the HealthPickup
     namespace pickupHealthType
@@ -56,5 +56,5 @@
         };
     }
-    
+
     /**
     @brief
@@ -71,14 +71,14 @@
     {
         public:
-        
+
             HealthPickup(BaseObject* creator); //!< Constructor.
             virtual ~HealthPickup(); //!< Destructor.
-            
+
             virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a HealthPickup object through XML.
             virtual void tick(float dt); //!< Is called every tick.
-            
+
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-            
+
             /**
             @brief Get the health that is transfered to the Pawn upon usage of this pickup.
@@ -93,13 +93,13 @@
             inline float getHealthRate(void)
                 { return this->healthRate_; }
-                
+
             /**
             @brief Get the type of HealthPickup, this pickup is.
-            @return Returns the health type as an enum. 
+            @return Returns the health type as an enum.
             */
             inline pickupHealthType::Value getHealthTypeDirect(void)
                 { return this->healthType_; }
             const std::string& getHealthType(void); //!< Get the health type of this pickup.
-            
+
         protected:
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
@@ -107,5 +107,5 @@
             void setHealth(float health); //!< Sets the health.
             void setHealthRate(float speed); //!< Set the rate at which health is transferred if the pickup is continuous.
-            
+
             /**
             @brief Set the health type of this pickup.
@@ -115,9 +115,9 @@
                 { this->healthType_ = type; }
             void setHealthType(std::string type); //!< Set the type of the HealthPickup.
-        
+
         private:
             void initialize(void); //!< Initializes the member variables.
             Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
-            
+
             float health_; //!< The health that is transferred to the Pawn.
             float healthRate_; //!< The rate at which the health is transferred.
@@ -125,10 +125,10 @@
             float maxHealthOverwrite_; //!< Helper to remember with which value we overwrote the maxHealh, to detect if someone else changed it as well.
             pickupHealthType::Value healthType_; //!< The type of the HealthPickup.
-            
+
             //! Strings for the health types.
             static const std::string healthTypeLimited_s;
             static const std::string healthTypeTemporary_s;
             static const std::string healthTypePermanent_s;
-        
+
     };
 }
Index: /code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h	(revision 7127)
@@ -44,5 +44,5 @@
 
 namespace orxonox {
-        
+
     /**
     @brief
@@ -57,5 +57,5 @@
     {
         public:
-        
+
             InvisiblePickup(BaseObject* creator); //!< Constructor.
             virtual ~InvisiblePickup(); //!< Destructor.
@@ -63,5 +63,5 @@
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-            
+
             /**
             @brief Checks whether the Pawn is invisible.
@@ -72,5 +72,5 @@
             inline float getDuration()
                 { return this->duration_; }
- 
+
         protected:
             bool setInvisible(bool invisibility); //!< Set the Pawn to be invisible or visible again.
@@ -78,5 +78,5 @@
             void initializeIdentifier(void);
             virtual void pickupTimerCallback(void); //!< Function that gets called when the timer ends.
-        
+
         private:
             void initialize(void); //!< Initializes the member variables.
Index: /code/branches/presentation3/src/modules/pickup/items/MetaPickup.cc
===================================================================
--- /code/branches/presentation3/src/modules/pickup/items/MetaPickup.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/items/MetaPickup.cc	(revision 7127)
@@ -40,12 +40,12 @@
 
 namespace orxonox {
- 
+
     CreateFactory(MetaPickup);
-    
+
     //! Setting the static variables to their values.
     /*static*/ const std::string MetaPickup::metaTypeNone_s = "none";
     /*static*/ const std::string MetaPickup::metaTypeUse_s = "use";
     /*static*/ const std::string MetaPickup::metaTypeDrop_s = "drop";
-    
+
     /**
     @brief
@@ -55,8 +55,8 @@
     {
         RegisterObject(MetaPickup);
-        
+
         this->initialize();
     }
-    
+
     /**
     @brief
@@ -65,7 +65,7 @@
     MetaPickup::~MetaPickup()
     {
-        
-    }
-    
+
+    }
+
     /**
     @brief
@@ -75,10 +75,10 @@
     {
         this->addTarget(ClassIdentifier<PickupCarrier>::getIdentifier());
-        
+
         this->setActivationTypeDirect(pickupActivationType::immediate);
         this->setDurationTypeDirect(pickupDurationType::once);
         this->metaType_ = pickupMetaType::none;
     }
-    
+
     /**
     @brief
@@ -91,5 +91,5 @@
         this->pickupIdentifier_->addParameter(type, val);
     }
-    
+
     /**
     @brief
@@ -99,10 +99,10 @@
     {
         SUPER(MetaPickup, XMLPort, xmlelement, mode);
-        
+
         XMLPortParam(MetaPickup, "metaType", setMetaType, getMetaType, xmlelement, mode);
-        
+
         this->initializeIdentifier();
     }
-    
+
     /**
     @brief
@@ -113,5 +113,5 @@
     {
         SUPER(MetaPickup, changedUsed);
-        
+
         //! If the MetaPickup transited to used.
         if(this->isUsed())
@@ -144,5 +144,5 @@
         }
     }
-        
+
     /**
     @brief
@@ -155,13 +155,13 @@
         if(item == NULL)
             item = new MetaPickup(this);
-        
+
         SUPER(MetaPickup, clone, item);
-        
+
         MetaPickup* pickup = dynamic_cast<MetaPickup*>(item);
         pickup->setMetaTypeDirect(this->getMetaTypeDirect());
-        
+
         pickup->initializeIdentifier();
     }
-    
+
     /**
     @brief
@@ -184,5 +184,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -206,4 +206,4 @@
         }
     }
-    
+
 }
Index: /code/branches/presentation3/src/modules/pickup/items/MetaPickup.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/items/MetaPickup.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/items/MetaPickup.h	(revision 7127)
@@ -51,5 +51,5 @@
         };
     }
-    
+
     /**
     @brief
@@ -60,14 +60,14 @@
     class _PickupExport MetaPickup : public Pickup
     {
-        
+
         public:
             MetaPickup(BaseObject* creator); //!< Constructor. Registers and initializes the object.
             virtual ~MetaPickup(); //!< Destructor.
-            
+
             virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a MetaPickup object through XML.
-            
+
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-            
+
             /**
             @brief Returns the meta type of the MetaPickup.
@@ -77,8 +77,8 @@
                 { return this->metaType_; }
             const std::string& getMetaType(void); //!< Get the meta type of this MetaPickup.
-            
+
         protected:
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
-            
+
             /**
             @brief Set the meta type of the MetaPickup.
@@ -88,16 +88,16 @@
                 { this->metaType_ =  type; }
             void setMetaType(const std::string& type); //!< Set the meta type of this MetaPickup.
-            
+
         private:
             void initialize(void); //!< Initializes the member variables.
-            
+
             pickupMetaType::Value metaType_; //!< The meta type of the MetaPickup, determines which actions are taken.
-            
+
             //! Static strings for the meta types.
             static const std::string metaTypeNone_s;
             static const std::string metaTypeUse_s;
             static const std::string metaTypeDrop_s;
-            
-        
+
+
     };
 
Index: /code/branches/presentation3/src/modules/pickup/items/ShieldPickup.cc
===================================================================
--- /code/branches/presentation3/src/modules/pickup/items/ShieldPickup.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/items/ShieldPickup.cc	(revision 7127)
@@ -79,5 +79,5 @@
         PickupCarrier* carrier = this->getCarrier();
         Pawn* pawn = dynamic_cast<Pawn*>(carrier);
-        
+
         if(pawn == NULL)
         {
@@ -86,5 +86,5 @@
         return pawn;
     }
-    
+
     /**
     @brief
@@ -117,5 +117,5 @@
         std::string val2 = stream.str();
         this->pickupIdentifier_->addParameter(type2, val2);
-        
+
         stream.clear();
         stream << this->getShieldAbsorption();
@@ -269,5 +269,5 @@
 
     void ShieldPickup::pickupTimerCallback(void)
-    {       
+    {
         this->setUsed(false);
     }
Index: /code/branches/presentation3/src/modules/pickup/items/SpeedPickup.cc
===================================================================
--- /code/branches/presentation3/src/modules/pickup/items/SpeedPickup.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/items/SpeedPickup.cc	(revision 7127)
@@ -137,5 +137,5 @@
         if(engine == NULL) //!< If the PickupCarrier is no Engine, then this pickup is useless and therefore is destroyed.
             this->destroy();
-        
+
         //! If the pickup has transited to used.
         if(this->isUsed())
@@ -156,5 +156,5 @@
             engine->setSpeedAdd(0.0f);
             engine->setSpeedMultiply(1.0f);
-            
+
             if(this->isOnce())
             {
@@ -186,5 +186,5 @@
             COUT(1) << "Invalid PickupCarrier in SpeedPickup." << std::endl;
         }
-        
+
         return engine;
     }
@@ -269,5 +269,5 @@
 
     void SpeedPickup::pickupTimerCallback(void)
-    {       
+    {
         this->setUsed(false);
     }
Index: /code/branches/presentation3/src/modules/pickup/items/SpeedPickup.h
===================================================================
--- /code/branches/presentation3/src/modules/pickup/items/SpeedPickup.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/pickup/items/SpeedPickup.h	(revision 7127)
@@ -78,5 +78,5 @@
         protected:
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
-            
+
             virtual void pickupTimerCallback(void); //!< Function that gets called when timer ends.
 
Index: /code/branches/presentation3/src/modules/questsystem/Quest.h
===================================================================
--- /code/branches/presentation3/src/modules/questsystem/Quest.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/questsystem/Quest.h	(revision 7127)
@@ -105,5 +105,5 @@
             virtual bool fail(PlayerInfo* player); //!< Fails the Quest.
             virtual bool complete(PlayerInfo* player); //!< Completes the Quest.
-            
+
             bool addListener(QuestListener* listener); //!< Adds a QuestListener to the list of QuestListeners listening to this Quest.
 
Index: /code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc
===================================================================
--- /code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc	(revision 7127)
@@ -112,10 +112,10 @@
         MultiTriggerContainer* mTrigger = orxonox_cast<MultiTriggerContainer*>(trigger);
         Pawn* pawn = NULL;
-        
+
         //! If the trigger is neither a Playertrigger nor a MultiTrigger (i.e. a MultitriggerContainer) we can do anything with it.
         if(pTrigger == NULL && mTrigger == NULL)
             return false;
-        
-        // If the trigger is a PlayerTrigger.        
+
+        // If the trigger is a PlayerTrigger.
         if(pTrigger != NULL)
         {
@@ -125,5 +125,5 @@
                 pawn = pTrigger->getTriggeringPlayer();
         }
-        
+
         // If the trigger is a MultiTrigger (i.e. a MultiTriggerContainer)
         if(mTrigger != NULL)
Index: /code/branches/presentation3/src/modules/questsystem/QuestItem.cc
===================================================================
--- /code/branches/presentation3/src/modules/questsystem/QuestItem.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/questsystem/QuestItem.cc	(revision 7127)
@@ -42,5 +42,5 @@
 
     CreateUnloadableFactory(QuestItem);
-    
+
     /**
     @brief
@@ -50,5 +50,5 @@
     {
         this->registered_ = false;
-        
+
         RegisterObject(QuestItem);
     }
Index: /code/branches/presentation3/src/modules/questsystem/QuestManager.cc
===================================================================
--- /code/branches/presentation3/src/modules/questsystem/QuestManager.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/questsystem/QuestManager.cc	(revision 7127)
@@ -74,5 +74,5 @@
     QuestManager::~QuestManager()
     {
-        
+
     }
 
@@ -250,5 +250,5 @@
         return numQuests;
     }
-    
+
     Quest* QuestManager::getParentQuest(PlayerInfo* player, int index)
     {
@@ -272,5 +272,5 @@
         return numQuests;
     }
-    
+
     Quest* QuestManager::getSubQuest(Quest* quest, PlayerInfo* player, int index)
     {
@@ -295,5 +295,5 @@
         return numHints;
     }
-    
+
     QuestHint* QuestManager::getHints(Quest* quest, PlayerInfo* player, int index)
     {
Index: /code/branches/presentation3/src/modules/questsystem/QuestNotification.cc
===================================================================
--- /code/branches/presentation3/src/modules/questsystem/QuestNotification.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/questsystem/QuestNotification.cc	(revision 7127)
@@ -35,5 +35,5 @@
 
     CreateUnloadableFactory(QuestNotification);
-    
+
     /**
     @brief
Index: /code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc
===================================================================
--- /code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc	(revision 7127)
@@ -41,5 +41,5 @@
 
     CreateUnloadableFactory(Notification);
-    
+
     /**
     @brief
@@ -69,5 +69,5 @@
     Notification::~Notification()
     {
-        
+
     }
 
Index: /code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc
===================================================================
--- /code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc	(revision 7127)
@@ -66,5 +66,5 @@
     NotificationManager::~NotificationManager()
     {
-        
+
     }
 
@@ -227,5 +227,5 @@
         int identifier = this->listenerList_.find(listener)->second;
         std::multimap<std::time_t, Notification*>* map = this->notificationLists_.find(identifier)->second;
-        
+
         // Make sure all Notifications are removed.
         std::multimap<std::time_t, Notification*>::iterator it = map->begin();
Index: /code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc
===================================================================
--- /code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc	(revision 7127)
@@ -57,5 +57,5 @@
     {
         this->registered_ = false;
-        
+
         RegisterObject(NotificationQueue);
         this->initialize();
@@ -431,5 +431,5 @@
         // Unregister the NotificationQueue with the NotificationManager.
         NotificationManager::getInstance().unregisterNotification(container->notification, this);
-        
+
         this->removeElement(container->overlay);
         this->containers_.erase(container);
Index: /code/branches/presentation3/src/modules/weapons/RocketController.cc
===================================================================
--- /code/branches/presentation3/src/modules/weapons/RocketController.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/weapons/RocketController.cc	(revision 7127)
@@ -28,5 +28,5 @@
 
 #include "RocketController.h"
-#include "projectiles/SimpleRocket.h" 
+#include "projectiles/SimpleRocket.h"
 #include "util/Math.h"
 #include "weapons/projectiles/SimpleRocket.h"
@@ -66,6 +66,6 @@
             this->moveToTargetPosition();
         }
-        
-        
+
+
     }
 
@@ -102,5 +102,5 @@
 
 
-        if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000) 
+        if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000)
             this->rocket_->setAcceleration(this->rocket_->getOrientation()*Vector3(-20,-20,-20));
         if (distance <1000) this->rocket_->setAcceleration(0,0,0);
Index: /code/branches/presentation3/src/modules/weapons/RocketController.h
===================================================================
--- /code/branches/presentation3/src/modules/weapons/RocketController.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/weapons/RocketController.h	(revision 7127)
@@ -50,5 +50,5 @@
             RocketController(BaseObject* creator);
             virtual ~RocketController();
-            
+
             virtual void tick(float dt);
             SimpleRocket* getRocket() const
@@ -64,5 +64,5 @@
             Vector3 targetPosition_;
             WeakPtr<PlayerInfo> player_;
-                        
+
             WeakPtr<WorldEntity> target_;
 
Index: /code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- /code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc	(revision 7127)
@@ -167,10 +167,10 @@
             this->localAngularVelocity_ = 0;
         }
-        
+
         if( GameMode::isMaster() )
         {
             if( this->bDestroy_ )
                 this->destroy();
-            
+
         }
     }
Index: /code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- /code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc	(revision 7127)
@@ -71,5 +71,5 @@
             this->fire_ = new ParticleEmitter(this);
             this->attach(this->fire_);
-           
+
             this->fire_->setOrientation(this->getOrientation());
             this->fire_->setSource("Orxonox/simplerocketfire");
@@ -90,5 +90,5 @@
 
 
-    
+
     /**
     * @brief updates state of rocket, disables fire if no fuel
@@ -107,16 +107,16 @@
             this->localAngularVelocity_ = 0;
 
-        
+
             if (this->fuel_)
             {
-                if (this->destroyTimer_.getRemainingTime()<  (static_cast<float>(this->FUEL_PERCENTAGE)/100) *this->lifetime_ ) 
+                if (this->destroyTimer_.getRemainingTime()<  (static_cast<float>(this->FUEL_PERCENTAGE)/100) *this->lifetime_ )
                     this->fuel_=false;
             } else
                 this->disableFire();
 
-            if( this->bDestroy_ ) 
+            if( this->bDestroy_ )
                 this->destroy();
         }
-                
+
     }
 
@@ -127,5 +127,5 @@
     void SimpleRocket::disableFire()
     {
-        this->setAcceleration(0,0,0);        
+        this->setAcceleration(0,0,0);
         this->fire_->detachFromParent();
     }
@@ -137,5 +137,5 @@
     SimpleRocket::~SimpleRocket()
     {
-        if (this->isInitialized()) 
+        if (this->isInitialized())
         {
             if( GameMode::isMaster() )
Index: /code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h
===================================================================
--- /code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h	(revision 7126)
+++ /code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h	(revision 7127)
@@ -98,5 +98,5 @@
             */
             inline void rotatePitch(float value)
-            {   
+            {
                 this->rotatePitch(Vector2(value, 0)); }
             /**
@@ -105,5 +105,5 @@
             */
             inline void rotateRoll(float value)
-            { 
+            {
                 this->rotateRoll(Vector2(value, 0)); }
 
@@ -124,5 +124,5 @@
             Vector3 localAngularVelocity_;
             float damage_;
-            bool bDestroy_; 
+            bool bDestroy_;
             bool fuel_; //!< Bool is true while the rocket "has fuel"
 
Index: /code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
===================================================================
--- /code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	(revision 7126)
+++ /code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	(revision 7127)
@@ -54,5 +54,5 @@
 
             this->setMunitionName("TargetSeeking Rockets");
-            this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4); 
+            this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4);
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
     }
Index: /code/branches/presentation3/src/orxonox/ChatHistory.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/ChatHistory.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/ChatHistory.cc	(revision 7127)
@@ -39,6 +39,6 @@
   /* constructor */
 #ifndef CHATTEST
-  //ChatHistory::ChatHistory( BaseObject* creator ) : BaseObject(creator) 
-  ChatHistory::ChatHistory() 
+  //ChatHistory::ChatHistory( BaseObject* creator ) : BaseObject(creator)
+  ChatHistory::ChatHistory()
 #else
   ChatHistory::ChatHistory()
@@ -68,5 +68,5 @@
   {
     chat_hist_closelog();
-    
+
     /* clear list */
     this->hist_buffer.clear();
@@ -74,5 +74,5 @@
 
   /* react to incoming chat */
-  void ChatHistory::incomingChat(const std::string& message, 
+  void ChatHistory::incomingChat(const std::string& message,
     unsigned int senderID)
   {
@@ -104,5 +104,5 @@
     /* add the line to the log */
     this->chat_hist_logline( text );
-  } 
+  }
 
   /* Synchronize logfile onto the hard drive */ /* MARK MARK */
@@ -128,5 +128,5 @@
   /* log a line to a logfile */
   int ChatHistory::chat_hist_logline( const std::string& toadd )
-  { 
+  {
     /* output the line to the file if logging is enabled */
     if( this->hist_log_enabled )
@@ -138,5 +138,5 @@
   int ChatHistory::chat_hist_openlog()
   {
-    /* TODO: find out the name of the file to log to via settings 
+    /* TODO: find out the name of the file to log to via settings
      *       and set the this->hist_logfile_path variable to it
      */
@@ -167,5 +167,5 @@
     /* see if we've actually got a logfile */
     if( this->hist_logfile )
-    { 
+    {
       /* yes, we've got one, add a line that shows we're closing it */
       this->chat_hist_logline( "--- Logfile closed ---" );
Index: /code/branches/presentation3/src/orxonox/ChatHistory.h
===================================================================
--- /code/branches/presentation3/src/orxonox/ChatHistory.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/ChatHistory.h	(revision 7127)
@@ -34,5 +34,5 @@
 
 /* define this if you're unit testing */
-//#define CHATTEST 
+//#define CHATTEST
 
 #ifndef CHATTEST
@@ -62,5 +62,5 @@
 
 #else
-  class ChatHistory 
+  class ChatHistory
 #endif
   {
@@ -75,15 +75,15 @@
       virtual ~ChatHistory();
 
-  
+
     //protected:
-      /** what to do with incoming chat 
-       * 
-       * \param message The incoming message 
+      /** what to do with incoming chat
+       *
+       * \param message The incoming message
        * \param senderID Identification number of the sender
        */
-      virtual void incomingChat(const std::string& message, 
+      virtual void incomingChat(const std::string& message,
         unsigned int senderID);
-      
-      /** Synchronize logfile onto the hard drive 
+
+      /** Synchronize logfile onto the hard drive
        *
        * \return 0 for success, other for error
@@ -93,5 +93,5 @@
       /** debug-print: output the whole history to stdout */
       void debug_printhist();
-      
+
     private:
       /* FIELDS */
Index: /code/branches/presentation3/src/orxonox/ChatInputHandler.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/ChatInputHandler.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/ChatInputHandler.cc	(revision 7127)
@@ -40,5 +40,5 @@
 #include <string>
 
-namespace orxonox 
+namespace orxonox
 {
   /* singleton */
@@ -48,5 +48,5 @@
   SetConsoleCommandAlias( ChatInputHandler, activate_static, "startchat",
     true );
-  SetConsoleCommandAlias( ChatInputHandler, activate_small_static, 
+  SetConsoleCommandAlias( ChatInputHandler, activate_small_static,
     "startchat_small", true );
 
@@ -111,5 +111,5 @@
 
     /* cast it to a listbox */
-    lb_history = dynamic_cast<CEGUI::Listbox*>(history); 
+    lb_history = dynamic_cast<CEGUI::Listbox*>(history);
 
     /* assert wee */
@@ -140,5 +140,5 @@
     }
 
-    // blues 
+    // blues
     red = 0.5, green = 0.5, blue = 1;
     for( ; i < NumberOfColors; ++i )
@@ -171,5 +171,5 @@
   }
 
-  void ChatInputHandler::deactivate() 
+  void ChatInputHandler::deactivate()
   {
     /* stop listening */
@@ -202,5 +202,5 @@
 
   /* handle incoming chat */
-  void ChatInputHandler::incomingChat(const std::string& message, 
+  void ChatInputHandler::incomingChat(const std::string& message,
     unsigned int senderID)
   {
@@ -210,5 +210,5 @@
     /* setup player name info */
     if (senderID != CLIENTID_UNKNOWN)
-    { 
+    {
        PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
        if (player)
@@ -227,20 +227,20 @@
     /* now add */
     this->lb_history->addItem( dynamic_cast<CEGUI::ListboxItem*>(toadd) );
-    this->lb_history->ensureItemIsVisible( 
+    this->lb_history->ensureItemIsVisible(
       dynamic_cast<CEGUI::ListboxItem*>(toadd) );
 
     /* make sure the history handles it */
     this->lb_history->handleUpdatedItemData();
-  } 
+  }
 
 
   /* sub for inputchanged */
-  void ChatInputHandler::sub_adjust_dispoffset( int maxlen, 
-    int cursorpos, 
+  void ChatInputHandler::sub_adjust_dispoffset( int maxlen,
+    int cursorpos,
     int inplen )
   {
     /* already start offsetting 5 characters before end */
     if( cursorpos+5 > maxlen )
-    { 
+    {
       /* always stay 5 characters ahead of end, looks better */
       ((disp_offset = cursorpos-maxlen+5) >= 0) ? 1 : disp_offset = 0;
@@ -249,5 +249,5 @@
       (disp_offset > cursorpos ) ? disp_offset = 0 : 1;
     }
-     
+
     /* make sure we don't die at substr */
     if( inplen <= disp_offset ) disp_offset = 0;
@@ -260,5 +260,5 @@
     std::string raw = this->inpbuf->get();
     int cursorpos = this->inpbuf->getCursorPosition();
-    
+
     /* get string before cursor */
     std::string left = raw.substr( 0, cursorpos );
@@ -268,12 +268,12 @@
     if( raw.length() >= left.length()+1 )
       right = raw.substr( cursorpos );
-      
+
     /* set the text */
     std::string assembled = "$ " + left + "|" + right;
 
     if( this->fullchat )
-    { 
+    {
       /* adjust curser position - magic number 5 for font width */
-      sub_adjust_dispoffset( (this->input->getUnclippedInnerRect().getWidth()/6), 
+      sub_adjust_dispoffset( (this->input->getUnclippedInnerRect().getWidth()/6),
         cursorpos, assembled.length() );
       this->input->setProperty( "Text", assembled.substr( disp_offset ) );
@@ -282,5 +282,5 @@
     {
       /* adjust curser position - magic number 5 for font width */
-      sub_adjust_dispoffset( (this->inputonly->getUnclippedInnerRect().getWidth()/6), 
+      sub_adjust_dispoffset( (this->inputonly->getUnclippedInnerRect().getWidth()/6),
         cursorpos, assembled.length() );
       this->inputonly->setProperty( "Text", assembled.substr( disp_offset) );
@@ -323,8 +323,8 @@
   void ChatInputHandler::cursorRight()
   { this->inpbuf->increaseCursor(); }
-  
+
   void ChatInputHandler::cursorLeft()
   { this->inpbuf->decreaseCursor(); }
-  
+
   void ChatInputHandler::cursorEnd()
   { this->inpbuf->setCursorToEnd(); }
Index: /code/branches/presentation3/src/orxonox/ChatInputHandler.h
===================================================================
--- /code/branches/presentation3/src/orxonox/ChatInputHandler.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/ChatInputHandler.h	(revision 7127)
@@ -62,5 +62,5 @@
     private:
       /** Input buffer, to be used to catch input from the
-       * keyboard 
+       * keyboard
        */
       InputBuffer *inpbuf;
@@ -126,11 +126,11 @@
        * history window of the full chat window)
        */
-      void incomingChat( const std::string& message, 
+      void incomingChat( const std::string& message,
         unsigned int senderID );
 
       /** \param full true means show full chat window with history,
             false means show only an input line
-       * 
-       * Show the chat window and redirect the game's keyboard input 
+       *
+       * Show the chat window and redirect the game's keyboard input
        * into it.
        */
Index: /code/branches/presentation3/src/orxonox/Level.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/Level.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/Level.cc	(revision 7127)
@@ -49,5 +49,5 @@
         RegisterObject(Level);
 
-        
+
         this->registerVariables();
         this->xmlfilename_ = this->getFilename();
@@ -73,5 +73,5 @@
         XMLPortParam(Level, "description", setDescription, getDescription, xmlelement, mode);
         XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
-            
+
         XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);
         XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
@@ -99,5 +99,5 @@
         Loader::open(this->xmlfile_);
     }
-    
+
     void Level::networkCallbackTemplatesChanged()
     {
@@ -151,5 +151,5 @@
         return 0;
     }
-    
+
     void Level::addLodInfo(MeshLodInformation* lodInformation)
     {
@@ -165,5 +165,5 @@
         if(this->lodInformation_.find(meshName)!=this->lodInformation_.end())
             return this->lodInformation_.find(meshName)->second;
-        
+
         return 0;
     }
Index: /code/branches/presentation3/src/orxonox/MoodManager.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/MoodManager.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/MoodManager.cc	(revision 7127)
@@ -45,5 +45,5 @@
         RegisterRootObject(MoodManager);
         this->setConfigValues();
-        
+
         // Checking for the existence of the folder for the default mood
         /* Note: Currently Resource::exists(path) will always return false when the path field points to a folder.
Index: /code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- /code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h	(revision 7127)
@@ -137,5 +137,5 @@
     class OrxonoxOverlay;
     class OverlayGroup;
-    
+
     // pickup
     class PickupIdentifier;
Index: /code/branches/presentation3/src/orxonox/Radar.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/Radar.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/Radar.cc	(revision 7127)
@@ -87,5 +87,5 @@
         }
     }
-    
+
     void Radar::removeRadarObject(RadarViewable* rv)
     {
@@ -203,5 +203,5 @@
         }
     }
-    
+
     void Radar::radarObjectChanged(RadarViewable* rv)
     {
Index: /code/branches/presentation3/src/orxonox/controllers/AIController.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/controllers/AIController.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/controllers/AIController.cc	(revision 7127)
@@ -112,5 +112,5 @@
             random = rnd(maxrand);
             if (random < 25 && (this->bShooting_))
-                this->bShooting_ = false; 
+                this->bShooting_ = false;
 
         }
@@ -127,5 +127,5 @@
             this->commandSlaves();
 
-            if  (this->specificMasterAction_ != NONE) 
+            if  (this->specificMasterAction_ != NONE)
                     this->specificMasterActionHold();
 
@@ -149,5 +149,5 @@
                  // lose master status (only if less than 4 slaves in formation)
                 random = rnd(maxrand);
-                if(random < 15/(this->slaves_.size()+1) && this->slaves_.size() < 4 ) 
+                if(random < 15/(this->slaves_.size()+1) && this->slaves_.size() < 4 )
                    this->loseMasterState();
 
Index: /code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc	(revision 7127)
@@ -91,5 +91,5 @@
         {
             this->removeFromFormation();
-            
+
             for (ObjectList<ArtificialController>::iterator it = ObjectList<ArtificialController>::begin(); it; ++it)
             {
@@ -101,5 +101,5 @@
                         it->myMaster_ = 0;
                     }
-                    
+
                     while (true)
                     {
@@ -139,10 +139,10 @@
         {
             Controller* controller = 0;
-            
+
             if (it->getController())
                 controller = it->getController();
             else if (it->getXMLController())
                 controller = it->getXMLController();
-                
+
             if (!controller)
                 continue;
@@ -162,5 +162,5 @@
 
     /**
-        @brief Get all masters to do a "specific master action" 
+        @brief Get all masters to do a "specific master action"
         @param action which action to perform (integer, so it can be called with a console command (tmp solution))
     */
@@ -170,10 +170,10 @@
         {
             Controller* controller = 0;
-            
+
             if (it->getController())
                 controller = it->getController();
             else if (it->getXMLController())
                 controller = it->getXMLController();
-                
+
             if (!controller)
                 continue;
@@ -204,10 +204,10 @@
         {
             Controller* controller = 0;
-            
+
             if (it->getController())
                 controller = it->getController();
             else if (it->getXMLController())
                 controller = it->getXMLController();
-                
+
             if (!controller)
                 continue;
@@ -252,10 +252,10 @@
         {
             Controller* controller = 0;
-            
+
             if (it->getController())
                 controller = it->getController();
             else if (it->getXMLController())
                 controller = it->getXMLController();
-                
+
             if (!controller)
                 continue;
@@ -280,10 +280,10 @@
         {
             Controller* controller = 0;
-            
+
             if (it->getController())
                 controller = it->getController();
             else if (it->getXMLController())
                 controller = it->getXMLController();
-                
+
             if (!controller)
                 continue;
@@ -303,5 +303,5 @@
     void ArtificialController::changedControllableEntity()
     {
-        if (!this->getControllableEntity()) 
+        if (!this->getControllableEntity())
             this->removeFromFormation();
     }
@@ -400,5 +400,5 @@
                 this->myMaster_->slaves_.erase(it);
         }
-        
+
         this->myMaster_ = 0;
         this->state_ = FREE;
@@ -423,10 +423,10 @@
             //has it an ArtificialController?
             Controller* controller = 0;
-            
+
             if (it->getController())
                 controller = it->getController();
             else if (it->getXMLController())
                 controller = it->getXMLController();
-                
+
             if (!controller)
                 continue;
@@ -476,5 +476,5 @@
         @brief Commands the slaves of a master into a formation. Sufficiently fast not to be called within tick. Initiated by a master.
     */
-    void ArtificialController::commandSlaves() 
+    void ArtificialController::commandSlaves()
     {
         if(this->state_ != MASTER) return;
@@ -489,5 +489,5 @@
             this->slaves_.front()->setTargetPosition(dest);
         }
-        else 
+        else
         {
             dest += 1.0f*orient*WorldEntity::BACK;
@@ -592,5 +592,5 @@
     bool ArtificialController::forcedFree()
     {
-        if(this->freedomCount_ > 0) 
+        if(this->freedomCount_ > 0)
         {
             this->freedomCount_--;
@@ -606,5 +606,5 @@
         if(this->state_ != MASTER) return;
 
-        if (specificMasterActionHoldCount_ == 0) 
+        if (specificMasterActionHoldCount_ == 0)
          {
             this->specificMasterAction_ = NONE;
@@ -677,5 +677,5 @@
         if (!always)
             this->specificMasterActionHoldCount_ = secondsToFollow;
-        else 
+        else
             this->specificMasterActionHoldCount_ = INT_MAX; //for now...
 
@@ -698,5 +698,5 @@
 
             currentHumanController = orxonox_cast<NewHumanController*>(it->getController());
-            if(currentHumanController) 
+            if(currentHumanController)
             {
                 if (!ArtificialController::sameTeam(this->getControllableEntity(), *it, this->getGametype())) continue;
Index: /code/branches/presentation3/src/orxonox/controllers/ArtificialController.h
===================================================================
--- /code/branches/presentation3/src/orxonox/controllers/ArtificialController.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/controllers/ArtificialController.h	(revision 7127)
@@ -64,5 +64,5 @@
             inline int getFormationSize() const
                 { return this->maxFormationSize_; }
-                
+
             inline void setPassive(bool passive)
                 { this->passive_ = passive; }
Index: /code/branches/presentation3/src/orxonox/controllers/DroneController.h
===================================================================
--- /code/branches/presentation3/src/orxonox/controllers/DroneController.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/controllers/DroneController.h	(revision 7127)
@@ -52,5 +52,5 @@
             DroneController(BaseObject* creator);
             virtual ~DroneController();
-            
+
             virtual void tick(float dt); //!< The controlling happens here. This method defines what the controller has to do each tick.
 
Index: /code/branches/presentation3/src/orxonox/gametypes/Gametype.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/gametypes/Gametype.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/gametypes/Gametype.cc	(revision 7127)
@@ -330,5 +330,5 @@
                 if (index == randomspawn)
                     return (*it);
-                
+
                 ++index;
             }
Index: /code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc	(revision 7127)
@@ -40,5 +40,5 @@
     CreateFactory(MeshLodInformation);
 
-    MeshLodInformation::MeshLodInformation(BaseObject* creator) 
+    MeshLodInformation::MeshLodInformation(BaseObject* creator)
     : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15)
     {
@@ -59,10 +59,10 @@
         XMLPortParam(MeshLodInformation, "reductionRate", setReductionRate, getReductionRate, xmlelement, mode);
     }
-    
+
     std::string MeshLodInformation::getMeshName()
     {
         return MeshLodInformation::getMeshSource();
     }
-    
+
     void MeshLodInformation::setLodLevel(float lodLevel)
     {
@@ -73,5 +73,5 @@
     {
         return lodLevel_;
-    } 
+    }
     void MeshLodInformation::setMeshSource(std::string meshSource)
     {
@@ -82,4 +82,4 @@
         return meshSource_;
     }
- 
+
 }
Index: /code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h
===================================================================
--- /code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h	(revision 7127)
@@ -43,5 +43,5 @@
             MeshLodInformation(BaseObject* creator);
             virtual ~MeshLodInformation();
-            
+
             float getLodLevel();
             std::string getMeshName();
@@ -49,5 +49,5 @@
             unsigned int getNumLevels(){ return this->numLevels_; }
             float getReductionRate(){ return this->reductionRate_; }
-            
+
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
Index: /code/branches/presentation3/src/orxonox/graphics/Model.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/graphics/Model.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/graphics/Model.cc	(revision 7127)
@@ -42,5 +42,5 @@
     CreateFactory(Model);
 
-    Model::Model(BaseObject* creator) : 
+    Model::Model(BaseObject* creator) :
         StaticEntity(creator), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15)
     {
@@ -59,7 +59,7 @@
     {
         SUPER(Model, XMLPort, xmlelement, mode);
-        
+
         XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode);
-        
+
         XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
         XMLPortParam(Model, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);
@@ -81,5 +81,5 @@
         return scaleFactor;
     }
-    
+
     void Model::changedMesh()
     {
@@ -88,5 +88,5 @@
             if (this->mesh_.getEntity())
                 this->detachOgreObject(this->mesh_.getEntity());
-            
+
             this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
 
@@ -96,13 +96,13 @@
                 this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
                 this->mesh_.setVisible(this->isVisible());
-                
-                
+
+
                 //LOD
                 if( this->mesh_.getEntity()->getMesh()->getNumLodLevels()==1 )
                 {
                     Level* level = this->getLevel();
-                  
+
                     assert( level != 0 );
-                    
+
                     MeshLodInformation* lodInfo = level->getLodInfo(this->meshSrc_);
                     if( lodInfo )
@@ -122,7 +122,7 @@
                         float volume = this->mesh_.getEntity()->getBoundingBox().volume();
     //                     float scaleFactor = 1;
-                        
+
     //                     BaseObject* creatorPtr = this;
-    //                     
+    //
     //                     while(creatorPtr!=NULL&&orxonox_cast<WorldEntity*>(creatorPtr))
     //                     {
@@ -131,5 +131,5 @@
     //                     }
     //                     COUT(0) << "name: " << this->meshSrc_ << "scaleFactor: " << scaleFactor << ", volume: " << volume << endl;
-                        
+
                         COUT(4) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and volume: "<< volume << ":" << std::endl;
 
@@ -144,5 +144,5 @@
     //                         float factor = scaleFactor*5/lodLevel_;
                             float factor = pow(volume, 2.0f / 3.0f) * 15.0f / lodLevel_;
-                            
+
                             COUT(4) << "LodLevel set with factor: " << factor << endl;
 
@@ -160,5 +160,5 @@
                                 distList.pop_back();
 
-                            
+
                             //Generiert LOD-Levels
                             this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, this->lodReductionRate_);
@@ -171,5 +171,5 @@
                             else
                                 what = "<0";
-                            
+
                             COUT(4)<<"LodLevel not set because lodLevel("<<lodLevel_<<") was "<<what<<"." << endl;
                         }
Index: /code/branches/presentation3/src/orxonox/graphics/Model.h
===================================================================
--- /code/branches/presentation3/src/orxonox/graphics/Model.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/graphics/Model.h	(revision 7127)
@@ -61,9 +61,9 @@
             inline bool getCastShadows() const
                 { return this->bCastShadows_; }
-                
+
         protected:
             void changedMesh();
             void changedShadows();
-            
+
             //LoD
             inline void setLodLevel(float lodLevel)
@@ -76,5 +76,5 @@
             Mesh mesh_;
             bool bCastShadows_;
-            
+
             //LoD
             float lodLevel_;
@@ -82,5 +82,5 @@
             unsigned int numLodLevels_;
             float lodReductionRate_;
-            
+
     };
 }
Index: /code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc	(revision 7127)
@@ -157,5 +157,5 @@
             it->staticmessage(this, message, colour);
     }
-    
+
      void GametypeInfo::dispatchFadingMessage(const std::string& message)
     {
Index: /code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc	(revision 7127)
@@ -52,5 +52,5 @@
         RegisterRootObject(GametypeMessageListener);
     }
-    
+
     //----------------------------
     // PickupCarrier
@@ -59,8 +59,8 @@
     {
         RegisterRootObject(PickupCarrier);
-        
+
         this->setCarrierName("PickupCarrier");
     }
-    
+
     PickupCarrier::~PickupCarrier()
     {
@@ -85,5 +85,5 @@
         this->isForPlayer_ = true;
     }
-    
+
     //----------------------------
     // RadarListener
Index: /code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h
===================================================================
--- /code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h	(revision 7127)
@@ -68,5 +68,5 @@
         friend class Pickupable;
         friend class PickupManager;
-        //! Friends. 
+        //! Friends.
         friend class Pickup;
         friend class HealthPickup;
@@ -170,5 +170,5 @@
             */
             virtual const Vector3& getCarrierPosition(void) = 0;
-            
+
             /**
             @brief Get the name of this PickupCarrier.
@@ -176,6 +176,6 @@
             */
             const std::string& getCarrierName(void) { return this->carrierName_; } // tolua_export
-            
-        protected:        
+
+        protected:
             /**
             @brief Get all direct children of this PickupSpawner.
@@ -198,5 +198,5 @@
             std::set<Pickupable*>& getPickups(void)
                 { return this->pickups_; }
-                
+
             /**
             @brief Set the name of this PickupCarrier.
@@ -206,9 +206,9 @@
             void setCarrierName(const std::string& name)
                 { this->carrierName_ = name; }
-        
+
         private:
             std::set<Pickupable*> pickups_; //!< The list of Pickupables carried by this PickupCarrier.
             std::string carrierName_; //!< The name of the PickupCarrier, as displayed in the PickupInventory.
-            
+
             /**
             @brief Get the number of carrier children this PickupCarrier has.
@@ -222,5 +222,5 @@
                     return size;
                 }
-            
+
             /**
             @brief Get the index-th child of this PickupCarrier.
@@ -237,5 +237,5 @@
                     return carrier;
                 }
-            
+
             /**
             @brief Get the number of Pickupables this PickupCarrier carries.
@@ -244,5 +244,5 @@
             unsigned int getNumPickups(void)
                 { return this->pickups_.size(); }
-            
+
             /**
             @brief Get the index-th Pickupable of this PickupCarrier.
@@ -259,5 +259,5 @@
                     return *it;
                 }
-            
+
     };
 }
Index: /code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc	(revision 7127)
@@ -46,5 +46,5 @@
 namespace orxonox
 {
-    
+
     /**
     @brief
@@ -52,15 +52,15 @@
     */
     Pickupable::Pickupable() : pickupIdentifier_(NULL), used_(false), pickedUp_(false)
-    {        
+    {
         RegisterRootObject(Pickupable);
-        
+
         this->carrier_ = NULL;
-        
+
         this->pickupIdentifier_ = new PickupIdentifier(this);
     }
-    
-    /**
-    @brief
-        Destructor. 
+
+    /**
+    @brief
+        Destructor.
     */
     Pickupable::~Pickupable()
@@ -68,5 +68,5 @@
         if(this->isUsed())
             this->setUsed(false);
-        
+
         if(this->isPickedUp() && this->getCarrier() != NULL)
         {
@@ -74,9 +74,9 @@
             this->setCarrier(NULL);
         }
-        
+
         if(this->pickupIdentifier_ != NULL)
             this->pickupIdentifier_->destroy();
     }
-    
+
     /**
     @brief
@@ -91,7 +91,7 @@
         if(this->used_ == used)
             return false;
-        
+
         COUT(4) << "Pickupable (&" << this << ") set to used " << used << "." << std::endl;
-        
+
         this->used_ = used;
         this->changedUsed();
@@ -100,5 +100,5 @@
         return true;
     }
-    
+
     /**
     @brief
@@ -115,5 +115,5 @@
         return this->isTarget(carrier->getIdentifier());
     }
-    
+
     /**
     @brief
@@ -134,5 +134,5 @@
         return false;
     }
-        
+
     /**
     @brief
@@ -147,5 +147,5 @@
         return this->addTarget(target->getIdentifier());
     }
-    
+
     /**
     @brief
@@ -160,12 +160,12 @@
         if(this->isTarget(target)) //!< If the input target is already present in the list of targets.
             return false;
-        
+
         COUT(4) << "Target " << target->getName() << " added to Pickupable (&" << this << ")." << std::endl;
         this->targets_.push_back(target);
         return true;
     }
-    
-    /**
-    @brief  
+
+    /**
+    @brief
         Sets the Pickupable to picked up.
         This method will be called by the PickupCarrier picking the Pickupable up.
@@ -179,5 +179,5 @@
         if(this->isPickedUp()) //!< If the Pickupable is already picked up.
             return false;
-        
+
         COUT(4) << "Pickupable (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl;
         this->setCarrier(carrier);
@@ -185,5 +185,5 @@
         return true;
     }
-    
+
     /**
     @brief
@@ -198,7 +198,7 @@
         if(this->pickedUp_ == pickedUp)
             return false;
-        
+
         COUT(4) << "Pickupable (&" << this << ") set to pickedUp " << pickedUp << "." << std::endl;
-        
+
         this->pickedUp_ = pickedUp;
         this->changedPickedUp();
@@ -206,5 +206,5 @@
         return true;
     }
-        
+
     /**
     @brief
@@ -217,7 +217,7 @@
         if(this->carrier_ == carrier)
             return false;
-        
+
         COUT(4) << "Pickupable (&" << this << ") changed Carrier (& " << carrier << ")." << std::endl;
-        
+
         this->carrier_ = carrier;
         this->changedCarrier();
@@ -226,7 +226,7 @@
         return true;
     }
-    
-    /**
-    @brief 
+
+    /**
+    @brief
         Sets the Pickupable to not picked up or dropped.
         This method will be called by the PickupCarrier dropping the Pickupable.
@@ -238,21 +238,21 @@
         if(!this->isPickedUp()) //!< If the Pickupable is not picked up.
             return false;
-        
+
         COUT(4) << "Pickupable (&" << this << ") got dropped up by a PickupCarrier (&" << this->getCarrier() << ")." << std::endl;
         this->setUsed(false);
         this->setPickedUp(false);
-        
+
         bool created = this->createSpawner();
-        
+
         this->setCarrier(NULL);
-        
+
         if(!created)
         {
             this->destroy();
         }
-        
-        return true;
-    }
-    
+
+        return true;
+    }
+
     /**
     @brief
@@ -265,11 +265,11 @@
         OrxonoxClass* item = NULL;
         this->clone(item);
-        
+
         Pickupable* pickup = dynamic_cast<Pickupable*>(item);
-        
+
         COUT(4) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << std::endl;
         return pickup;
     }
-    
+
     /**
     @brief
@@ -299,4 +299,4 @@
         return carrier->pickup(this);
     }
-    
+
 }
Index: /code/branches/presentation3/src/orxonox/interfaces/Pickupable.h
===================================================================
--- /code/branches/presentation3/src/orxonox/interfaces/Pickupable.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/interfaces/Pickupable.h	(revision 7127)
@@ -45,5 +45,5 @@
 namespace orxonox // tolua_export
 { // tolua_export
-    
+
     /**
     @brief
@@ -57,8 +57,8 @@
         protected:
             Pickupable(); //!< Default constructor.
-        
+
         public:
             virtual ~Pickupable(); //!< Default destructor.
-            
+
             /**
             @brief Get whether the pickup is currently in use or not.
@@ -71,5 +71,5 @@
             */
             virtual void changedUsed(void) {}
-            
+
             /**
             @brief Get the carrier of the pickup.
@@ -83,5 +83,5 @@
             */
             virtual void changedCarrier(void) {}
-            
+
             /**
             @brief Returns whether the Pickupable is currently picked up.
@@ -94,16 +94,16 @@
             */
             virtual void changedPickedUp(void) {}
-            
+
             bool pickedUp(PickupCarrier* carrier); //!< Sets the Pickupable to picked up.
             bool dropped(void); //!< Sets the Pickupable to not picked up or dropped.
-            
+
             virtual bool isTarget(PickupCarrier* carrier) const; //!< Get whether the given PickupCarrier is a target of this pickup.
             bool isTarget(const Identifier* identifier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this Pickupable.
             bool addTarget(PickupCarrier* target); //!< Add a PickupCarrier as target of this pickup.
             bool addTarget(Identifier* identifier); //!< Add a class, representetd by the input Identifier, as target of this pickup.
-            
+
             Pickupable* clone(void); //!< Creates a duplicate of the Pickupable.
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-            
+
             /**
             @brief Get the PickupIdentifier of this Pickupable.
@@ -112,9 +112,9 @@
             virtual const PickupIdentifier* getPickupIdentifier(void)
                 { return this->pickupIdentifier_; }
-                
+
             bool setUsed(bool used); //!< Sets the Pickupable to used or unused, depending on the input.
             bool setPickedUp(bool pickedUp); //!< Helper method to set the Pickupable to either picked up or not picked up.
             bool setCarrier(PickupCarrier* carrier, bool tell = false); //!< Sets the carrier of the pickup.
-            
+
         protected:
             /**
@@ -122,5 +122,5 @@
             */
             void initializeIdentifier(void) {}
-            
+
             /**
             @brief Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
@@ -131,12 +131,12 @@
             */
             virtual bool createSpawner(void) = 0;
-            
+
             PickupIdentifier* pickupIdentifier_; //!< The PickupIdentifier of this Pickupable.
-            
+
         private:
-            
+
             bool used_; //!< Whether the pickup is currently in use or not.
             bool pickedUp_; //!< Whether the pickup is currently picked up or not.
-            
+
             PickupCarrier* carrier_; //!< The carrier of the pickup.
             std::list<Identifier*> targets_; //!< The possible targets of this pickup.
@@ -147,5 +147,5 @@
 
     };  // tolua_export
-    
+
     SUPER_FUNCTION(10, Pickupable, changedUsed, false);
     SUPER_FUNCTION(12, Pickupable, changedCarrier, false);
Index: /code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc	(revision 7127)
@@ -65,5 +65,5 @@
     RadarViewable::~RadarViewable()
     {
-        
+
         if( this->bInitialized_ )
         {
@@ -109,5 +109,5 @@
         }
     }
-    
+
     void RadarViewable::settingsChanged()
     {
Index: /code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h
===================================================================
--- /code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h	(revision 7127)
@@ -88,5 +88,5 @@
 
         inline void setRadarVisibility(bool b)
-            { 
+            {
                 if(b!=this->bVisibility_)
                 {
Index: /code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.cc	(revision 7127)
@@ -39,5 +39,5 @@
 namespace orxonox
 {
-    
+
     /**
     @brief
@@ -47,16 +47,16 @@
     {
         RegisterRootObject(PickupIdentifier);
-        
+
         if(pickup == NULL)
             COUT(1) << "Error, PickupIdentifier was created without a valid Pickupable." << std::endl;
-        
+
         this->pickup_ = pickup;
     }
-    
+
     PickupIdentifier::~PickupIdentifier()
     {
 
     }
-    
+
     /**
     @brief
@@ -74,5 +74,5 @@
             COUT(1) << "Error in PickupIdentifier::compare: Input Identifier is NULL." << std::endl;
         }
-        
+
         if(identifier->pickup_ == NULL && this->pickup_ == NULL)
         {
@@ -80,5 +80,5 @@
             COUT(1) << "Error in PickupIdentifier::compare: Pickup stored by Identifier is NULL." << std::endl;
         }
-        
+
         if(identifier->pickup_ == NULL)
         {
@@ -86,5 +86,5 @@
             COUT(1) << "Error in PickupIdentifier::compare: Pickup stored by Identifier is NULL." << std::endl;
         }
-        
+
         if(this->pickup_ == NULL)
         {
@@ -92,9 +92,9 @@
             COUT(1) << "Error in PickupIdentifier::compare: Pickup stored by Identifier is NULL." << std::endl;
         }
-        
+
         //! If the classIdentifiers are not the same (meaning the PickupIdentifiers identify different classes), the obviously the two Pickupables identified by the PickupIdentifiers cannot be the same. An ordering is established through the alphabetical ordering of the respective classnames.
         if(!identifier->pickup_->getIdentifier()->isExactlyA(this->pickup_->getIdentifier()))
             return this->pickup_->getIdentifier()->getName().compare(identifier->pickup_->getIdentifier()->getName());
-        
+
         //! If the class is the same for both PickupIdentifiers we go on to check the parameters of the class.
         //! If the two have a different number of parameters then obviusly something is very wrong.
@@ -104,5 +104,5 @@
             return this->parameters_.size()-identifier->parameters_.size();
         }
-        
+
         //! We iterate through all parameters and compar their values (which are strings). The first parameter is the most significant. The ordering is once again established by the alphabetical comparison of the two value strings.
         for(std::map<std::string, std::string>::const_iterator it = this->parameters_.begin(); it != this->parameters_.end(); it++)
@@ -117,8 +117,8 @@
                 return it->second.compare(identifier->parameters_.find(it->first)->second);
         }
-            
+
         return 0;
     }
-    
+
     /**
     @brief
@@ -134,5 +134,5 @@
     {
         COUT(4) << "PickupIdentifier " << name << ", " << value << std::endl;
-        
+
         if(!(this->parameters_.find(name) == this->parameters_.end()))
         {
@@ -140,9 +140,9 @@
             return false;
         }
-        
+
         this->parameters_[name] = value;
-        
+
         return true;
     }
-    
+
 }
Index: /code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.h
===================================================================
--- /code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.h	(revision 7127)
@@ -41,9 +41,9 @@
 #include "core/Identifier.h"
 
-#include "core/OrxonoxClass.h" 
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
 {
-    
+
     /**
     @brief
@@ -57,19 +57,19 @@
     class _OrxonoxExport PickupIdentifier : virtual public OrxonoxClass
     {
-        
+
         public:
             PickupIdentifier(Pickupable* pickup); //!< Constructor.
             ~PickupIdentifier(); //!< Destructor.
-            
+
             virtual int compare(const PickupIdentifier* identifier) const; //!< Compares two PickupIdentifiers and returns 0 if a == b, <0 if a < b and >0 if a > b for a.compare(b).
-            
+
             bool addParameter(std::string & name, std::string & value); //!< Add a parameter to the PickupIdentifier.
-            
+
         private:
             Pickupable* pickup_; //!< The Pickupable the PickupIdentififer is for.
             std::map<std::string, std::string> parameters_; //!< The parameters identifying the type of the pickup beyond the class.
-            
+
     };
-    
+
     /**
     @brief
@@ -81,5 +81,5 @@
             { return lhs->compare(rhs) < 0; }
     };
-    
+
 }
 
Index: /code/branches/presentation3/src/orxonox/worldentities/Drone.h
===================================================================
--- /code/branches/presentation3/src/orxonox/worldentities/Drone.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/worldentities/Drone.h	(revision 7127)
@@ -53,5 +53,5 @@
             virtual void tick(float dt); //!< Defines which actions the Drone has to take in each tick.
 
-            
+
             virtual void moveFrontBack(const Vector2& value);
             virtual void moveRightLeft(const Vector2& value);
@@ -61,5 +61,5 @@
             virtual void rotatePitch(const Vector2& value);
             virtual void rotateRoll(const Vector2& value);
-            
+
             /**
             @brief Moves the Drone in the Front/Back-direction by the specifed amount.
@@ -80,5 +80,5 @@
             inline void moveUpDown(float value)
             { this->moveUpDown(Vector2(value, 0)); }
-            
+
             /**
             @brief Rotates the Drone around the y-axis by the specifed amount.
@@ -99,5 +99,5 @@
             inline void rotateRoll(float value)
             { this->rotateRoll(Vector2(value, 0)); }
-            
+
             /**
             @brief Sets the primary thrust to the input amount.
@@ -105,9 +105,9 @@
             */
             inline void setPrimaryThrust( float thrust )
-                { this->primaryThrust_=thrust; }      
+                { this->primaryThrust_=thrust; }
             inline void setAuxilaryThrust( float thrust )
-                { this->auxilaryThrust_=thrust; }      
+                { this->auxilaryThrust_=thrust; }
             inline void setRotationThrust( float thrust )
-                { this->rotationThrust_=thrust; }      
+                { this->rotationThrust_=thrust; }
             inline void setMaxDistanceToOwner( float distance)
                 { this->maxDistanceToOwner_=distance; }
@@ -117,5 +117,5 @@
                 { this->maxShootingRange_=distance; }
 
-            
+
             /**
             @brief Gets the primary thrust to the input amount.
@@ -134,11 +134,11 @@
             inline float getMaxShootingRange()
                 { return this->maxShootingRange_; }
-            
+
         private:
             DroneController *myController_; //!< The controller of the Drone.
-            
+
             btVector3 localLinearAcceleration_; //!< The linear acceleration that is used to move the Drone the next tick.
             btVector3 localAngularAcceleration_; //!< The linear angular acceleration that is used to move the Drone the next tick.
-            float primaryThrust_; //!< The amount of primary thrust. This is just used, when moving forward. 
+            float primaryThrust_; //!< The amount of primary thrust. This is just used, when moving forward.
             float auxilaryThrust_; //!< The amount of auxilary thrust. Used for all other movements (except for rotations).
             float rotationThrust_; //!< The amount of rotation thrust. Used for rotations only.
Index: /code/branches/presentation3/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- /code/branches/presentation3/src/orxonox/worldentities/WorldEntity.cc	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/worldentities/WorldEntity.cc	(revision 7127)
@@ -81,5 +81,5 @@
         this->node_->setPosition(Vector3::ZERO);
         this->node_->setOrientation(Quaternion::IDENTITY);
-        
+
         // Activity and visibility memory.
         this->bActiveMem_ = true;
@@ -205,5 +205,5 @@
         registerVariable(this->parentID_,       VariableDirection::ToClient, new NetworkCallback<WorldEntity>(this, &WorldEntity::networkcallback_parentChanged));
     }
-    
+
     /**
     @brief
@@ -213,5 +213,5 @@
     {
         SUPER(WorldEntity, changedActivity);
-        
+
         for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
         {
@@ -227,5 +227,5 @@
         }
     }
-    
+
     /**
     @brief
@@ -235,5 +235,5 @@
     {
         SUPER(WorldEntity, changedVisibility);
-        
+
         for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
         {
Index: /code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h
===================================================================
--- /code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h	(revision 7126)
+++ /code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h	(revision 7127)
@@ -105,5 +105,5 @@
             static const Vector3 DOWN;
             static const Vector3 UP;
-            
+
             virtual void changedActivity(void);
             virtual void changedVisibility(void);
@@ -234,5 +234,5 @@
             std::set<WorldEntity*> children_;
             bool bDeleteWithParent_;
-            
+
             bool bActiveMem_;
             bool bVisibleMem_;
