Index: code/branches/presentation2/src/orxonox/controllers/HumanController.h
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/HumanController.h	(revision 6387)
+++ code/branches/presentation2/src/orxonox/controllers/HumanController.h	(revision 6388)
@@ -38,5 +38,5 @@
 namespace orxonox
 {
-    class _OrxonoxExport HumanController 
+    class _OrxonoxExport HumanController
 // tolua_end
         : public Controller, public Tickable
Index: code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc	(revision 6387)
+++ code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc	(revision 6388)
@@ -248,5 +248,5 @@
                     HumanController::moveFrontBack(Vector2(1, 0));
                 else
-                    HumanController::moveFrontBack(Vector2(this->acceleration_, 0)); 
+                    HumanController::moveFrontBack(Vector2(this->acceleration_, 0));
                 this->accelerating_ = false;
                 //HumanController::moveFrontBack(Vector2(clamp(this->acceleration_ + this->currentAcceleration_, 0.0f, 1.0f), 0));
Index: code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h
===================================================================
--- code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h	(revision 6387)
+++ code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h	(revision 6388)
@@ -177,5 +177,5 @@
         inline OverlayGroup* getOverlayGroup() const
             { return this->group_; }
-        virtual void changedOverlayGroup() 
+        virtual void changedOverlayGroup()
             { this->changedVisibility(); }
 
Index: code/branches/presentation2/src/orxonox/pickup/UsableItem.cc
===================================================================
--- code/branches/presentation2/src/orxonox/pickup/UsableItem.cc	(revision 6387)
+++ code/branches/presentation2/src/orxonox/pickup/UsableItem.cc	(revision 6388)
@@ -41,5 +41,5 @@
         @param creator Pointer to the object which created this item.
     */
-    UsableItem::UsableItem(BaseObject* creator) : BaseItem(creator) 
+    UsableItem::UsableItem(BaseObject* creator) : BaseItem(creator)
     {
         RegisterObject(UsableItem);
Index: code/branches/presentation2/src/orxonox/sound/AmbientSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/AmbientSound.cc	(revision 6387)
+++ code/branches/presentation2/src/orxonox/sound/AmbientSound.cc	(revision 6388)
@@ -118,5 +118,5 @@
                 this->setSource(path);
             else
-                COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;       
+                COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;
         }
     }
@@ -134,5 +134,5 @@
         if (this->isActive())
             this->play();
-        else 
+        else
             this->stop();
     }
Index: code/branches/presentation2/src/orxonox/sound/BaseSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/BaseSound.cc	(revision 6387)
+++ code/branches/presentation2/src/orxonox/sound/BaseSound.cc	(revision 6388)
@@ -177,5 +177,5 @@
             pitch = pitch > 2 ? 2 : pitch;
             pitch = pitch < 0.5 ? 0.5 : pitch;
-        }        
+        }
         this->pitch_ = pitch;
         if (alIsSource(this->audioSource_))
@@ -224,5 +224,5 @@
         if (alIsSource(this->audioSource_)) // already playing or paused
         {
-            // Set new buffer 
+            // Set new buffer
             alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
             if (ALuint error = alGetError())
Index: code/branches/presentation2/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundManager.cc	(revision 6387)
+++ code/branches/presentation2/src/orxonox/sound/SoundManager.cc	(revision 6388)
@@ -254,5 +254,5 @@
     }
 
-    float SoundManager::getVolume(SoundType::Value type) 
+    float SoundManager::getVolume(SoundType::Value type)
     {
         if (type < 0 || type > SoundType::Effects)
@@ -261,5 +261,5 @@
     }
 
-    float SoundManager::getRealVolume(SoundType::Value type) 
+    float SoundManager::getRealVolume(SoundType::Value type)
     {
         if (type != SoundType::Music && type != SoundType::Effects)
@@ -339,5 +339,5 @@
             }
 
-            if (!this->ambientSounds_.empty()) 
+            if (!this->ambientSounds_.empty())
             {
                 this->fadeOut(ambientSounds_.front().first);
@@ -354,5 +354,5 @@
             return;
 
-        if (this->ambientSounds_.front().first == oldAmbient) 
+        if (this->ambientSounds_.front().first == oldAmbient)
         {
             this->fadeOut(oldAmbient);
Index: code/branches/presentation2/src/orxonox/sound/WorldSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/WorldSound.cc	(revision 6387)
+++ code/branches/presentation2/src/orxonox/sound/WorldSound.cc	(revision 6388)
@@ -110,10 +110,10 @@
     }
 
-    void WorldSound::changedActivity() 
+    void WorldSound::changedActivity()
     {
         SUPER(WorldSound, changedActivity);
         if (this->isActive())
             this->play();
-        else 
+        else
             this->stop();
     }
Index: code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h
===================================================================
--- code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h	(revision 6387)
+++ code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h	(revision 6388)
@@ -70,8 +70,8 @@
 
             inline void setEnableCollisionDamage(bool c)
-            { 
-                this->enableCollisionDamage_ = c; 
+            {
+                this->enableCollisionDamage_ = c;
                 this->enableCollisionCallback();
-            } 
+            }
 
             inline bool getEnableCollisionDamage()
