diff --git a/CMakeLists.txt b/CMakeLists.txt
index 392fdfc66..9168d9a5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,16 +38,12 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
 
                 set(GIT_VERSION "${GIT_VERSION_MAJOR}.${GIT_VERSION_MINOR}.${GIT_VERSION_RELEASE}")
 
-                if(NOT ${OPENMW_VERSION} STREQUAL ${GIT_VERSION})
-                    message(FATAL_ERROR "Silly Zini forgot to update the version again...")
-                else(NOT ${OPENMW_VERSION} STREQUAL ${GIT_VERSION})
                     set(OPENMW_VERSION_MAJOR ${GIT_VERSION_MAJOR})
                     set(OPENMW_VERSION_MINOR ${GIT_VERSION_MINOR})
                     set(OPENMW_VERSION_RELEASE ${GIT_VERSION_RELEASE})
 
                     set(OPENMW_VERSION_COMMITHASH "${COMMITHASH}")
                     set(OPENMW_VERSION_TAGHASH "${TAGHASH}")
-                endif(NOT ${OPENMW_VERSION} STREQUAL ${GIT_VERSION})
 
                 message(STATUS "OpenMW version ${OPENMW_VERSION}")
             else(MATCH)
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 855e89cad..fa9c92e7d 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -167,6 +167,7 @@ namespace CSMWorld
             ColumnId_PcRank = 154,
             ColumnId_Scope = 155,
             ColumnId_ReferenceableId = 156,
+            ColumnId_ContainerContent = 157,
 
             // Allocated to a separate value range, so we don't get a collision should we ever need
             // to extend the number of use values.
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 50998c36f..31797d081 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -130,6 +130,7 @@ void CSMWorld::IdTable::cloneRecord(const std::string& origin,
                                     CSMWorld::UniversalId::Type type)
 {
     int index = mIdCollection->getAppendIndex (destination);
+
     beginInsertRows (QModelIndex(), index, index);
     mIdCollection->cloneRecord(origin, destination, type);
     endInsertRows();
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index f00e9fc77..afb61acc6 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -173,9 +173,9 @@ void CSMWorld::ClothingRefIdAdapter::setData (const RefIdColumn *column, RefIdDa
 }
 
 CSMWorld::ContainerRefIdAdapter::ContainerRefIdAdapter (const NameColumns& columns,
-    const RefIdColumn *weight, const RefIdColumn *organic, const RefIdColumn *respawn)
+    const RefIdColumn *weight, const RefIdColumn *organic, const RefIdColumn *respawn, const RefIdColumn *content)
 : NameRefIdAdapter<ESM::Container> (UniversalId::Type_Container, columns), mWeight (weight),
-  mOrganic (organic), mRespawn (respawn)
+  mOrganic (organic), mRespawn (respawn), mContent(content)
 {}
 
 QVariant CSMWorld::ContainerRefIdAdapter::getData (const RefIdColumn *column, const RefIdData& data,
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index bd509a86b..59c8c6461 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -34,7 +34,7 @@ namespace CSMWorld
             BaseRefIdAdapter (UniversalId::Type type, const BaseColumns& base);
 
             virtual std::string getId (const RecordBase& record) const;
-            
+
             virtual void setId (RecordBase& record, const std::string& id);
 
             virtual QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
@@ -57,7 +57,7 @@ namespace CSMWorld
     {
         (dynamic_cast<Record<RecordT>&> (record).get().mId) = id;
     }
-    
+
     template<typename RecordT>
     std::string BaseRefIdAdapter<RecordT>::getId (const RecordBase& record) const
     {
@@ -610,11 +610,12 @@ namespace CSMWorld
             const RefIdColumn *mWeight;
             const RefIdColumn *mOrganic;
             const RefIdColumn *mRespawn;
+            const RefIdColumn *mContent;
 
         public:
 
             ContainerRefIdAdapter (const NameColumns& columns, const RefIdColumn *weight,
-                const RefIdColumn *organic, const RefIdColumn *respawn);
+                const RefIdColumn *organic, const RefIdColumn *respawn, const RefIdColumn *content);
 
             virtual QVariant getData (const RefIdColumn *column, const RefIdData& data, int index)
                 const;
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index f515e34d8..1745ce957 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -165,6 +165,9 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.push_back (RefIdColumn (Columns::ColumnId_Respawn, ColumnBase::Display_Boolean));
     const RefIdColumn *respawn = &mColumns.back();
 
+    mColumns.push_back(RefIdColumn (Columns::ColumnId_ContainerContent, ColumnBase::Display_None, ColumnBase::Flag_Dialogue, false, false));
+    const RefIdColumn *content = &mColumns.back();
+
     CreatureColumns creatureColumns (actorsColumns);
 
     mColumns.push_back (RefIdColumn (Columns::ColumnId_CreatureType, ColumnBase::Display_CreatureType));
@@ -340,7 +343,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mAdapters.insert (std::make_pair (UniversalId::Type_Clothing,
         new ClothingRefIdAdapter (enchantableColumns, clothingType)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Container,
-        new ContainerRefIdAdapter (nameColumns, weightCapacity, organic, respawn)));
+        new ContainerRefIdAdapter (nameColumns, weightCapacity, organic, respawn, content)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Creature,
         new CreatureRefIdAdapter (creatureColumns)));
     mAdapters.insert (std::make_pair (UniversalId::Type_Door,
diff --git a/apps/opencs/model/world/refiddata.hpp b/apps/opencs/model/world/refiddata.hpp
index 1b600364c..535e914ee 100644
--- a/apps/opencs/model/world/refiddata.hpp
+++ b/apps/opencs/model/world/refiddata.hpp
@@ -231,27 +231,27 @@ namespace CSMWorld
 
             void save (int index, ESM::ESMWriter& writer) const;
 
-	    //RECORD CONTAINERS ACCESS METHODS
-	    const RefIdDataContainer<ESM::Book>& getBooks() const;
-	    const RefIdDataContainer<ESM::Activator>& getActivators() const;
-	    const RefIdDataContainer<ESM::Potion>& getPotions() const;
-	    const RefIdDataContainer<ESM::Apparatus>& getApparati() const;
-	    const RefIdDataContainer<ESM::Armor>& getArmors() const;
-	    const RefIdDataContainer<ESM::Clothing>& getClothing() const;
-	    const RefIdDataContainer<ESM::Container>& getContainers() const;
-	    const RefIdDataContainer<ESM::Creature>& getCreatures() const;
-	    const RefIdDataContainer<ESM::Door>& getDoors() const;
-	    const RefIdDataContainer<ESM::Ingredient>& getIngredients() const;
-	    const RefIdDataContainer<ESM::CreatureLevList>& getCreatureLevelledLists() const;
-	    const RefIdDataContainer<ESM::ItemLevList>& getItemLevelledList() const;
-	    const RefIdDataContainer<ESM::Light>& getLights() const;
-	    const RefIdDataContainer<ESM::Lockpick>& getLocpicks() const;
-	    const RefIdDataContainer<ESM::Miscellaneous>& getMiscellaneous() const;
-	    const RefIdDataContainer<ESM::NPC>& getNPCs() const;
-	    const RefIdDataContainer<ESM::Weapon >& getWeapons() const;
-	    const RefIdDataContainer<ESM::Probe >& getProbes() const;
-	    const RefIdDataContainer<ESM::Repair>& getRepairs() const;
-	    const RefIdDataContainer<ESM::Static>& getStatics() const;
+        //RECORD CONTAINERS ACCESS METHODS
+            const RefIdDataContainer<ESM::Book>& getBooks() const;
+            const RefIdDataContainer<ESM::Activator>& getActivators() const;
+            const RefIdDataContainer<ESM::Potion>& getPotions() const;
+            const RefIdDataContainer<ESM::Apparatus>& getApparati() const;
+            const RefIdDataContainer<ESM::Armor>& getArmors() const;
+            const RefIdDataContainer<ESM::Clothing>& getClothing() const;
+            const RefIdDataContainer<ESM::Container>& getContainers() const;
+            const RefIdDataContainer<ESM::Creature>& getCreatures() const;
+            const RefIdDataContainer<ESM::Door>& getDoors() const;
+            const RefIdDataContainer<ESM::Ingredient>& getIngredients() const;
+            const RefIdDataContainer<ESM::CreatureLevList>& getCreatureLevelledLists() const;
+            const RefIdDataContainer<ESM::ItemLevList>& getItemLevelledList() const;
+            const RefIdDataContainer<ESM::Light>& getLights() const;
+            const RefIdDataContainer<ESM::Lockpick>& getLocpicks() const;
+            const RefIdDataContainer<ESM::Miscellaneous>& getMiscellaneous() const;
+            const RefIdDataContainer<ESM::NPC>& getNPCs() const;
+            const RefIdDataContainer<ESM::Weapon >& getWeapons() const;
+            const RefIdDataContainer<ESM::Probe >& getProbes() const;
+            const RefIdDataContainer<ESM::Repair>& getRepairs() const;
+            const RefIdDataContainer<ESM::Static>& getStatics() const;
     };
 }