Index: code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc	(revision 10917)
@@ -65,5 +65,5 @@
         {
             // Delete all children
-            for (auto& mapEntry : this->attachedShapes_)
+            for (const auto& mapEntry : this->attachedShapes_)
             {
                 // make sure that the child doesn't want to detach itself --> speedup because of the missing update
@@ -266,5 +266,5 @@
         std::vector<CollisionShape*> shapes;
         // Iterate through all attached CollisionShapes and add them to the list of shapes.
-        for(auto& mapEntry : this->attachedShapes_)
+        for(const auto& mapEntry : this->attachedShapes_)
             shapes.push_back(mapEntry.first);
 
Index: code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc	(revision 10917)
@@ -231,5 +231,5 @@
     int ArtificialController::getFiremode(std::string name)
     {
-        for (auto& mapEntry : this->weaponModes_)
+        for (const auto& mapEntry : this->weaponModes_)
         {
             if (mapEntry.first == name)
Index: code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.cc	(revision 10917)
@@ -405,5 +405,5 @@
     void Dynamicmatch::rewardPig()
     {
-        for (auto& mapEntry : this->playerParty_) //durch alle Spieler iterieren und alle piggys finden
+        for (const auto& mapEntry : this->playerParty_) //durch alle Spieler iterieren und alle piggys finden
         {
             if (mapEntry.second==piggy)//Spieler mit der Pig-party frags++
@@ -441,5 +441,5 @@
             if (tutorial) // Announce selectionphase
             {
-             for (auto& mapEntry : this->playerParty_)
+             for (const auto& mapEntry : this->playerParty_)
                 {
                     if (!mapEntry.first)//in order to catch nullpointer
@@ -456,5 +456,5 @@
              if(tutorial&&(!notEnoughKillers)&&(!notEnoughChasers)) //Selection phase over
              {
-                  for (auto& mapEntry : this->playerParty_)
+                  for (const auto& mapEntry : this->playerParty_)
                   {
                        if (!mapEntry.first)//in order to catch nullpointer
@@ -490,5 +490,5 @@
             if (tutorial) // Announce selectionphase
             {
-             for (auto& mapEntry : this->playerParty_)
+             for (const auto& mapEntry : this->playerParty_)
                 {
                     if (!mapEntry.first)//in order to catch nullpointer
@@ -505,5 +505,5 @@
             if(tutorial&&(!notEnoughPigs)&&(!notEnoughChasers)) //Selection phase over
              {
-                  for (auto& mapEntry : this->playerParty_)
+                  for (const auto& mapEntry : this->playerParty_)
                   {
                        if (!mapEntry.first)
@@ -540,5 +540,5 @@
             if (tutorial) // Announce selectionphase
             {
-             for (auto& mapEntry : this->playerParty_)
+             for (const auto& mapEntry : this->playerParty_)
                 {
                     if (!mapEntry.first)//in order to catch nullpointer
@@ -555,5 +555,5 @@
              if(tutorial&&(!notEnoughPigs)&&(!notEnoughKillers)) //Selection phase over
              {
-                  for (auto& mapEntry : this->playerParty_)
+                  for (const auto& mapEntry : this->playerParty_)
                   {
                        if (!mapEntry.first)
@@ -620,5 +620,5 @@
         else if(tutorial) // Announce selectionphase
         {
-            for (auto& mapEntry : this->playerParty_)
+            for (const auto& mapEntry : this->playerParty_)
             {
                 if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
Index: code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc	(revision 10917)
@@ -139,5 +139,5 @@
         if (!this->gtinfo_->hasStarted())
         {
-            for (auto& mapEntry : this->players_)
+            for (const auto& mapEntry : this->players_)
             {
                 // Inform the GametypeInfo that the player is ready to spawn.
@@ -169,5 +169,5 @@
         }
 
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if (mapEntry.first->getControllableEntity())
@@ -404,5 +404,5 @@
                     bool allplayersready = true;
                     bool hashumanplayers = false;
-                    for (auto& mapEntry : this->players_)
+                    for (const auto& mapEntry : this->players_)
                     {
                         if (!mapEntry.first->isReadyToSpawn())
@@ -430,5 +430,5 @@
     void Gametype::spawnPlayersIfRequested()
     {
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_)
@@ -439,5 +439,5 @@
     void Gametype::spawnDeadPlayersIfRequested()
     {
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
             if (mapEntry.second.state_ == PlayerState::Dead)
                 if (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_)
@@ -538,5 +538,5 @@
     GSLevelMementoState* Gametype::exportMementoState()
     {
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if (mapEntry.first->isHumanPlayer() && mapEntry.first->getControllableEntity() && mapEntry.first->getControllableEntity()->getCamera())
@@ -587,5 +587,5 @@
 
         // find correct player and assign default entity with original position & orientation
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if (mapEntry.first->isHumanPlayer())
Index: code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.cc	(revision 10917)
@@ -56,5 +56,5 @@
     void LastManStanding::spawnDeadPlayersIfRequested()
     {
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
             if (mapEntry.second.state_ == PlayerState::Dead)
             {
@@ -114,5 +114,5 @@
     {
         int min=lives;
-        for (auto& mapEntry : this->playerLives_)
+        for (const auto& mapEntry : this->playerLives_)
         {
             if (mapEntry.second<=0)
@@ -128,5 +128,5 @@
         Gametype::end();
 
-        for (auto& mapEntry : this->playerLives_)
+        for (const auto& mapEntry : this->playerLives_)
         {
             if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
Index: code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.cc	(revision 10917)
@@ -145,5 +145,5 @@
     void LastTeamStanding::spawnDeadPlayersIfRequested()
     {
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
             if (mapEntry.second.state_ == PlayerState::Dead)
             {
@@ -229,5 +229,5 @@
         int party = -1;
         //find a player who survived
-        for (auto& mapEntry : this->playerLives_)
+        for (const auto& mapEntry : this->playerLives_)
         {
           if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
@@ -255,5 +255,5 @@
     {
         int min = lives;
-        for (auto& mapEntry : this->playerLives_)
+        for (const auto& mapEntry : this->playerLives_)
         {
             if (mapEntry.second <= 0)
Index: code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc	(revision 10917)
@@ -187,5 +187,5 @@
             }
 
-            for (auto& mapEntry : this->teamnumbers_)
+            for (const auto& mapEntry : this->teamnumbers_)
             {
                 if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
Index: code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.cc	(revision 10917)
@@ -69,5 +69,5 @@
         int winnerTeam = 0;
         int highestScore = 0;
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if ( this->getTeamScore(mapEntry.first) > highestScore )
Index: code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc	(revision 10917)
@@ -99,5 +99,5 @@
         std::vector<unsigned int> playersperteam(this->teams_, 0);
 
-        for (auto& mapEntry : this->teamnumbers_)
+        for (const auto& mapEntry : this->teamnumbers_)
             if (mapEntry.second < static_cast<int>(this->teams_) && mapEntry.second >= 0)
                 playersperteam[mapEntry.second]++;
@@ -141,5 +141,5 @@
     void TeamGametype::spawnDeadPlayersIfRequested()
     {
-        for (auto& mapEntry : this->players_)\
+        for (const auto& mapEntry : this->players_)\
         {
             if(allowedInGame_[mapEntry.first] == false)//check if dead player is allowed to enter
@@ -178,5 +178,5 @@
         if(!player || this->getTeam(player) == -1)
             return 0;
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
         {
             if ( this->getTeam(mapEntry.first) ==  this->getTeam(player) )
@@ -191,5 +191,5 @@
     {
         int teamSize = 0;
-        for (auto& mapEntry : this->teamnumbers_)
+        for (const auto& mapEntry : this->teamnumbers_)
         {
             if (mapEntry.second == team)
@@ -202,5 +202,5 @@
     {
         int teamSize = 0;
-        for (auto& mapEntry : this->teamnumbers_)
+        for (const auto& mapEntry : this->teamnumbers_)
         {
             if (mapEntry.second == team  && mapEntry.first->isHumanPlayer())
@@ -376,5 +376,5 @@
     void TeamGametype::announceTeamWin(int winnerTeam)
     {
-        for (auto& mapEntry : this->teamnumbers_)
+        for (const auto& mapEntry : this->teamnumbers_)
         {
             if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
Index: code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc	(revision 10917)
@@ -74,5 +74,5 @@
         this->gameEnded_ = true;
 
-        for (auto& mapEntry : this->teamnumbers_)
+        for (const auto& mapEntry : this->teamnumbers_)
         {
             if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
@@ -155,5 +155,5 @@
                 ChatManager::message(message);
 
-                for (auto& mapEntry : this->teamnumbers_)
+                for (const auto& mapEntry : this->teamnumbers_)
                 {
                     if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
Index: code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc	(revision 10917)
@@ -55,5 +55,5 @@
     Munition::~Munition()
     {
-        for (auto& mapEntry : this->currentMagazines_)
+        for (const auto& mapEntry : this->currentMagazines_)
             delete mapEntry.second;
     }
@@ -316,5 +316,5 @@
             {
                 bool change = false;
-                for (auto& mapEntry : this->currentMagazines_)
+                for (const auto& mapEntry : this->currentMagazines_)
                 {
                     // Add munition if the magazine isn't full (but only to loaded magazines)
Index: code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc	(revision 10917)
@@ -61,5 +61,5 @@
                 this->weaponPack_->removeWeapon(this);
 
-            for (auto& mapEntry : this->weaponmodes_)
+            for (const auto& mapEntry : this->weaponmodes_)
                 mapEntry.second->destroy();
         }
@@ -136,5 +136,5 @@
     void Weapon::reload()
     {
-        for (auto& mapEntry : this->weaponmodes_)
+        for (const auto& mapEntry : this->weaponmodes_)
             mapEntry.second->reload();
     }
@@ -148,5 +148,5 @@
     void Weapon::notifyWeaponModes()
     {
-        for (auto& mapEntry : this->weaponmodes_)
+        for (const auto& mapEntry : this->weaponmodes_)
             mapEntry.second->setWeapon(this);
     }
Index: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc	(revision 10917)
@@ -63,5 +63,5 @@
     {
         // Fire all WeaponPacks with their defined weaponmode
-        for (auto& mapEntry : this->weaponpacks_)
+        for (const auto& mapEntry : this->weaponpacks_)
             if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED)
                 mapEntry.first->fire(mapEntry.second);
@@ -71,5 +71,5 @@
     {
         // Reload all WeaponPacks with their defined weaponmode
-        for (auto& mapEntry : this->weaponpacks_)
+        for (const auto& mapEntry : this->weaponpacks_)
             mapEntry.first->reload();
     }
Index: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc	(revision 10916)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc	(revision 10917)
@@ -196,5 +196,5 @@
 
         // Assign the desired weaponmode to the firemodes
-        for (auto& mapEntry : this->weaponSets_)
+        for (const auto& mapEntry : this->weaponSets_)
         {
             unsigned int weaponmode = wPack->getDesiredWeaponmode(mapEntry.first);
@@ -219,5 +219,5 @@
 
         // Remove all added links from the WeaponSets
-        for (auto& mapEntry : this->weaponSets_)
+        for (const auto& mapEntry : this->weaponSets_)
             mapEntry.second->removeWeaponmodeLink(wPack);
 
@@ -268,5 +268,5 @@
         // Check if the WeaponSet belongs to this WeaponSystem
         bool foundWeaponSet = false;
-        for (auto& mapEntry : this->weaponSets_)
+        for (const auto& mapEntry : this->weaponSets_)
         {
             if (mapEntry.second == wSet)
@@ -296,5 +296,5 @@
     void WeaponSystem::reload()
     {
-        for (auto& mapEntry : this->weaponSets_)
+        for (const auto& mapEntry : this->weaponSets_)
             mapEntry.second->reload();
     }
