Index: /code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc	(revision 10817)
@@ -54,4 +54,5 @@
 #include "util/Exception.h"
 #include "commandline/CommandLineIncludes.h"
+#include "core/ApplicationPaths.h"
 
 // Differentiate Boost Filesystem v2 and v3
Index: /code/branches/cpp11_v2/src/libraries/core/Core.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/Core.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/Core.h	(revision 10817)
@@ -45,4 +45,5 @@
 
 #include <string>
+#include <list>
 #include "util/DestructionHelper.h"
 #include "util/Singleton.h"
Index: /code/branches/cpp11_v2/src/libraries/core/CoreIncludes.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/CoreIncludes.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/CoreIncludes.h	(revision 10817)
@@ -221,5 +221,5 @@
         struct InheritsFromClass : public Identifier::InheritsFrom
         {
-            virtual Identifier* getParent() const { return Class(T); }
+            virtual Identifier* getParent() const override { return Class(T); }
         };
 
@@ -231,10 +231,10 @@
             ~StaticallyInitializedIdentifier() { delete identifier_; }
 
-            virtual void load()
+            virtual void load() override
             {
                 IdentifierManager::getInstance().addIdentifier(this->identifier_);
             }
 
-            virtual void unload()
+            virtual void unload() override
             {
                 IdentifierManager::getInstance().removeIdentifier(this->identifier_);
Index: /code/branches/cpp11_v2/src/libraries/core/CoreStaticInitializationHandler.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/CoreStaticInitializationHandler.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/CoreStaticInitializationHandler.h	(revision 10817)
@@ -43,9 +43,9 @@
             CoreStaticInitializationHandler() : bInitInstances_(false) {}
 
-            virtual void setupHandler();
-            virtual void shutdownHandler();
+            virtual void setupHandler() override;
+            virtual void shutdownHandler() override;
 
-            virtual void loadModule(ModuleInstance* module);
-            virtual void unloadModule(ModuleInstance* module);
+            virtual void loadModule(ModuleInstance* module) override;
+            virtual void unloadModule(ModuleInstance* module) override;
 
             inline void setInitInstances(bool bInitInstances)
Index: /code/branches/cpp11_v2/src/libraries/core/GUIManager.cc
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/GUIManager.cc	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/GUIManager.cc	(revision 10817)
@@ -124,5 +124,5 @@
     {
     public:
-        void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard)
+        void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard) override
         {
             OutputLevel orxonoxLevel = level::debug_output;
@@ -143,5 +143,5 @@
 
         /// Carbon copy from CEGUIDefaultLogger.cpp with a bugfix for Windows
-        void setLogFilename(const CEGUI::String& filename, bool append = false)
+        void setLogFilename(const CEGUI::String& filename, bool append = false) override
         {
             // Close current log file (if any)
@@ -228,5 +228,5 @@
     public:
         /// Callback from Ogre invoked before other stuff in our target queue is rendered
-        void renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue)
+        void renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue) override
         {
             if (id == Ogre::RENDER_QUEUE_OVERLAY && invocation.empty())
Index: /code/branches/cpp11_v2/src/libraries/core/GUIManager.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/GUIManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/GUIManager.h	(revision 10817)
@@ -169,17 +169,17 @@
 
         // keyHandler functions
-        void buttonPressed (const KeyEvent& evt);
-        void buttonReleased(const KeyEvent& evt);
+        void buttonPressed (const KeyEvent& evt) override;
+        void buttonReleased(const KeyEvent& evt) override;
 
         // mouseHandler functions
-        void buttonPressed (MouseButtonCode::ByEnum id);
-        void buttonReleased(MouseButtonCode::ByEnum id);
-        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
-        void mouseScrolled (int abs, int rel);
+        void buttonPressed (MouseButtonCode::ByEnum id) override;
+        void buttonReleased(MouseButtonCode::ByEnum id) override;
+        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
+        void mouseScrolled (int abs, int rel) override;
         void mouseLeft     ();
 
         // window event handler
-        virtual void windowResized(unsigned int newWidth, unsigned int newHeight);
-        virtual void windowFocusChanged(bool bFocus);
+        virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
+        virtual void windowFocusChanged(bool bFocus) override;
 
 #ifdef ORXONOX_OLD_CEGUI
Index: /code/branches/cpp11_v2/src/libraries/core/Game.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/Game.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/Game.h	(revision 10817)
@@ -135,5 +135,5 @@
         {
         public:
-            std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info)
+            std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) override
                 { return std::shared_ptr<GameState>(std::make_shared<T>(info)); }
         };
Index: /code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc	(revision 10817)
@@ -82,11 +82,11 @@
     {
     public:
-        void windowResized     (Ogre::RenderWindow* rw)
+        void windowResized     (Ogre::RenderWindow* rw) override
             { orxonox::WindowEventListener::resizeWindow(rw->getWidth(), rw->getHeight()); }
-        void windowFocusChange (Ogre::RenderWindow* rw)
+        void windowFocusChange (Ogre::RenderWindow* rw) override
             { orxonox::WindowEventListener::changeWindowFocus(rw->isActive()); }
-        void windowClosed      (Ogre::RenderWindow* rw)
+        void windowClosed      (Ogre::RenderWindow* rw) override
             { orxonox::Game::getInstance().stop(); }
-        void windowMoved       (Ogre::RenderWindow* rw)
+        void windowMoved       (Ogre::RenderWindow* rw) override
             { orxonox::WindowEventListener::moveWindow(); }
     };
Index: /code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h	(revision 10817)
@@ -111,5 +111,5 @@
         // event from Ogre::LogListener
 #if OGRE_VERSION >= 0x010800
-        void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage);
+        void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage) override;
 #else
         void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName);
Index: /code/branches/cpp11_v2/src/libraries/core/LuaState.cc
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/LuaState.cc	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/LuaState.cc	(revision 10817)
@@ -33,5 +33,5 @@
 extern "C" {
 #include <lua.h>
-#include <lualib.h>
+#include <lualib.h>	
 }
 #include <loki/ScopeGuard.h>
Index: /code/branches/cpp11_v2/src/libraries/core/Namespace.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/Namespace.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/Namespace.h	(revision 10817)
@@ -50,5 +50,5 @@
             virtual ~Namespace();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void loadObjects(BaseObject* object);
Index: /code/branches/cpp11_v2/src/libraries/core/Template.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/Template.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/Template.h	(revision 10817)
@@ -54,6 +54,6 @@
             virtual ~Template();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedName();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedName() override;
 
             inline void setLink(const std::string& link)
Index: /code/branches/cpp11_v2/src/libraries/core/XMLPort.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/XMLPort.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/XMLPort.h	(revision 10817)
@@ -459,5 +459,5 @@
             }
 
-            virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiType& param)
+            virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiType& param) override
             {
                 if (!this->loadexecutor_->defaultValueSet(index))
@@ -465,5 +465,5 @@
                 return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
             }
-            virtual XMLPortParamContainer& defaultValues(const MultiType& param1)
+            virtual XMLPortParamContainer& defaultValues(const MultiType& param1) override
             {
                 if (!this->loadexecutor_->defaultValueSet(0))
@@ -471,5 +471,5 @@
                 return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
             }
-            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2)
+            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2) override
             {
                 if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)))
@@ -477,5 +477,5 @@
                 return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
             }
-            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3)
+            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3) override
             {
                 if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)))
@@ -483,5 +483,5 @@
                 return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
             }
-            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4)
+            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4) override
             {
                 if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)) || (!this->loadexecutor_->defaultValueSet(3)))
@@ -489,5 +489,5 @@
                 return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
             }
-            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5)
+            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5) override
             {
                 if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)) || (!this->loadexecutor_->defaultValueSet(3)) || (!this->loadexecutor_->defaultValueSet(4)))
@@ -556,5 +556,5 @@
             }
 
-            void callLoadExecutor(BaseObject* object, BaseObject* newObject)
+            void callLoadExecutor(BaseObject* object, BaseObject* newObject) override
             {
                 T* castObject = orxonox_cast<T*>(object);
Index: /code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/class/Identifier.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/class/Identifier.h	(revision 10817)
@@ -289,13 +289,13 @@
             bool initializeObject(T* object);
 
-            virtual void updateConfigValues(bool updateChildren = true) const;
-
-            virtual const std::type_info& getTypeInfo()
+            virtual void updateConfigValues(bool updateChildren = true) const override;
+
+            virtual const std::type_info& getTypeInfo() override
                 { return typeid(T); }
 
-            virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const
+            virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const override
                 { return dynamic_cast<T*>(object) != nullptr; }
 
-            virtual void destroyObjects();
+            virtual void destroyObjects() override;
 
             static ClassIdentifier<T>* getIdentifier();
Index: /code/branches/cpp11_v2/src/libraries/core/class/Super.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/class/Super.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/class/Super.h	(revision 10817)
@@ -584,5 +584,5 @@
         // Creates the super-function-callers by calling the first SuperFunctionCondition check
         // This get's called within the initialization of an Identifier
-        virtual void createSuperFunctionCaller() const
+        virtual void createSuperFunctionCaller() const override
         {
             SuperFunctionCondition<0, T, 0, 0>::superCheck();
Index: /code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandIncludes.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandIncludes.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandIncludes.h	(revision 10817)
@@ -316,6 +316,6 @@
             ~StaticallyInitializedConsoleCommand() { delete command_; }
 
-            virtual void load();
-            virtual void unload();
+            virtual void load() override;
+            virtual void unload() override;
 
             inline ConsoleCommand& getCommand()
Index: /code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h	(revision 10817)
@@ -38,4 +38,6 @@
 
 #include "util/Singleton.h"
+
+#include <map>
 
 namespace orxonox
Index: /code/branches/cpp11_v2/src/libraries/core/command/Functor.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/command/Functor.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/command/Functor.h	(revision 10817)
@@ -249,5 +249,5 @@
 
             // see Functor::operator()()
-            MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null)
+            MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override
             {
                 // call the function if an object was assigned
@@ -262,5 +262,5 @@
 
             // see Functor::getType()
-            inline Functor::Type::Enum getType() const
+            inline Functor::Type::Enum getType() const override
                 { return Functor::Type::Member; }
 
@@ -280,12 +280,12 @@
 
             // see Functor::setRawObjectPointer()
-            inline void setRawObjectPointer(void* object)
+            inline void setRawObjectPointer(void* object) override
                 { this->setObject((O*)object); }
             // see Functor::getRawObjectPointer()
-            inline void* getRawObjectPointer() const
+            inline void* getRawObjectPointer() const override
                 { return this->object_; }
 
             // see Functor::setSafeMode()
-            inline void setSafeMode(bool bSafeMode)
+            inline void setSafeMode(bool bSafeMode) override
             {
                 if (bSafeMode == this->bSafeMode_)
@@ -309,5 +309,5 @@
 
             /// Will be called by Destroyable::~Destroyable() if the stored object is deleted and the Functor is in safe mode.
-            inline void objectDeleted()
+            inline void objectDeleted() override
                 { this->object_ = nullptr; }
 
@@ -328,5 +328,5 @@
 
             // see Functor::operator()()
-            MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null)
+            MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override
             {
                 return (*this)((void*)nullptr, param1, param2, param3, param4, param5);
@@ -334,16 +334,16 @@
 
             // see Functor::getType()
-            inline Functor::Type::Enum getType() const
+            inline Functor::Type::Enum getType() const override
                 { return Functor::Type::Static; }
 
             // see Functor::setRawObjectPointer()
-            inline void setRawObjectPointer(void*)
+            inline void setRawObjectPointer(void*) override
                 { orxout(internal_warning) << "Can't assign an object pointer to a static functor" << endl; }
             // see Functor::getRawObjectPointer()
-            inline void* getRawObjectPointer() const
+            inline void* getRawObjectPointer() const override
                 { return nullptr; }
 
             // see Functor::setSafeMode()
-            inline void setSafeMode(bool) {}
+            inline void setSafeMode(bool) override {}
     };
 
Index: /code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.h	(revision 10817)
@@ -65,10 +65,10 @@
 
         // Methods from ShellListener
-        void linesChanged();
-        void lineAdded();
-        void inputChanged();
-        void cursorChanged();
-        void executed();
-        void exit();
+        void linesChanged() override;
+        void lineAdded() override;
+        void inputChanged() override;
+        void cursorChanged() override;
+        void executed() override;
+        void exit() override;
 
         bool willPrintStatusLines();
Index: /code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.h	(revision 10817)
@@ -67,10 +67,10 @@
 
         // Methods from ShellListener
-        void linesChanged();
-        void lineAdded();
-        void inputChanged();
-        void cursorChanged();
-        void executed();
-        void exit();
+        void linesChanged() override;
+        void lineAdded() override;
+        void inputChanged() override;
+        void cursorChanged() override;
+        void executed() override;
+        void exit() override;
 
         void resetTerminalMode();
Index: /code/branches/cpp11_v2/src/libraries/core/command/Shell.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/command/Shell.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/command/Shell.h	(revision 10817)
@@ -151,5 +151,5 @@
 
             // DevModeListener
-            void devModeChanged(bool value);
+            void devModeChanged(bool value) override;
 
             void addToHistory(const std::string& command);
@@ -157,5 +157,5 @@
             void clearInput();
             // BaseWriter
-            virtual void printLine(const std::string& line, OutputLevel level);
+            virtual void printLine(const std::string& line, OutputLevel level) override;
 
             void configureInputBuffer();
Index: /code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineIncludes.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineIncludes.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineIncludes.h	(revision 10817)
@@ -64,8 +64,8 @@
             ~StaticallyInitializedCommandLineArgument() { delete argument_; }
 
-            virtual void load()
+            virtual void load() override
                 { CommandLineParser::addArgument(this->argument_); }
 
-            virtual void unload()
+            virtual void unload() override
                 { CommandLineParser::removeArgument(this->argument_); }
 
Index: /code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc	(revision 10817)
@@ -38,4 +38,5 @@
 #include <iterator>
 #include <algorithm>
+#include <fstream>
 
 #include "util/Convert.h"
Index: /code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h	(revision 10817)
@@ -56,19 +56,19 @@
             inline virtual ~ConfigFileEntryComment() {}
 
-            inline virtual const std::string& getName() const
+            inline virtual const std::string& getName() const override
                 { return this->comment_; }
 
-            inline virtual void setComment(const std::string& comment)
+            inline virtual void setComment(const std::string& comment) override
                 { this->comment_ = comment; }
 
-            inline virtual void setValue(const std::string& value)
+            inline virtual void setValue(const std::string& value) override
                 {}
-            inline virtual const std::string& getValue() const
+            inline virtual const std::string& getValue() const override
                 { return BLANKSTRING; }
 
-            inline void setString(bool bString)
+            inline void setString(bool bString) override
                 {}
 
-            inline virtual const std::string& getFileEntry() const
+            inline virtual const std::string& getFileEntry() const override
                 { return this->comment_; }
 
Index: /code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h	(revision 10817)
@@ -69,19 +69,19 @@
             inline virtual ~ConfigFileEntryValue() {}
 
-            inline virtual const std::string& getName() const
+            inline virtual const std::string& getName() const override
                 { return this->name_; }
 
-            inline virtual void setComment(const std::string& comment)
+            inline virtual void setComment(const std::string& comment) override
                 { this->additionalComment_ = comment; this->update(); }
 
-            inline virtual void setValue(const std::string& value)
+            inline virtual void setValue(const std::string& value) override
                 { this->value_ = value; this->update(); }
-            inline virtual const std::string& getValue() const
+            inline virtual const std::string& getValue() const override
                 { return this->value_; }
 
-            inline void virtual setString(bool bString)
+            inline void virtual setString(bool bString) override
                 { this->bString_ = bString; this->update(); }
 
-            inline virtual const std::string& getFileEntry() const
+            inline virtual const std::string& getFileEntry() const override
                 { return this->fileEntry_; }
 
Index: /code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h	(revision 10817)
@@ -67,13 +67,13 @@
             inline ~ConfigFileEntryVectorValue() {}
 
-            inline unsigned int getIndex() const
+            inline unsigned int getIndex() const override
                 { return this->index_; }
 
             /// Returns the "key" of the value (the name of the vector plus the index of the element)
-            inline const std::string& getKeyString() const
+            inline const std::string& getKeyString() const override
                 { return this->keyString_; }
 
         private:
-            void update();
+            void update() override;
 
             unsigned int index_;        ///< The index of the element in the vector
Index: /code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h	(revision 10817)
@@ -68,5 +68,5 @@
             inline ConfigValueCallback(void (T::*function) (void)) : function_(function) {}
             inline virtual ~ConfigValueCallback() {}
-            inline virtual void call(void* object)
+            inline virtual void call(void* object) override
             {
                 if (!IdentifierManager::getInstance().isCreatingHierarchy())
Index: /code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h	(revision 10817)
@@ -56,6 +56,6 @@
         using Button::execute;
         bool execute();
-        bool addParamCommand(ParamCommand* command);
-        void clear();
+        bool addParamCommand(ParamCommand* command) override;
+        void clear() override;
         void reset();
 
Index: /code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h	(revision 10817)
@@ -66,5 +66,5 @@
         { }
         virtual ~InputBufferListenerTuple() { }
-        void callFunction()
+        void callFunction() override
         {
             (listener_->*function_)();
@@ -165,13 +165,13 @@
                 { if (this->cursor_ > 0) { --this->cursor_; } }
 
-            void buttonPressed(const KeyEvent& evt);
+            void buttonPressed(const KeyEvent& evt) override;
 
         private:
             bool charIsAllowed(const char& input);
 
-            void buttonHeld   (const KeyEvent& evt);
+            void buttonHeld   (const KeyEvent& evt) override;
             void processKey   (const KeyEvent& evt);
 
-            void keyboardUpdated(float dt);
+            void keyboardUpdated(float dt) override;
 
             std::string buffer_;
Index: /code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h	(revision 10817)
@@ -76,7 +76,7 @@
     {
     public:
-        bool execute(float abs = 1.0f, float rel = 1.0f);
-        CommandEvaluation* getEvaluation();
-        virtual SimpleCommand* clone() { return new SimpleCommand(*this); }
+        bool execute(float abs = 1.0f, float rel = 1.0f) override;
+        CommandEvaluation* getEvaluation() override;
+        virtual SimpleCommand* clone() override { return new SimpleCommand(*this); }
 
         CommandEvaluation evaluation_;
@@ -104,7 +104,7 @@
     public:
         ParamCommand() : scale_(1.0f), paramCommand_(nullptr) { }
-        bool execute(float abs = 1.0f, float rel = 1.0f);
-        CommandEvaluation* getEvaluation();
-        virtual ParamCommand* clone() { return new ParamCommand(*this); }
+        bool execute(float abs = 1.0f, float rel = 1.0f) override;
+        CommandEvaluation* getEvaluation() override;
+        virtual ParamCommand* clone() override { return new ParamCommand(*this); }
 
         float scale_;
Index: /code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h	(revision 10817)
@@ -153,5 +153,5 @@
 
         //! Captures OIS events (which then get distributed to the derived class) and creates the button held events
-        void update(const Clock& time)
+        void update(const Clock& time) override
         {
             oisDevice_->capture();
@@ -160,5 +160,5 @@
             for (unsigned int iB = 0; iB < pressedButtons_.size(); ++iB)
                 for (unsigned int iS = 0; iS < inputStates_.size(); ++iS)
-                    inputStates_[iS]->buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
+                    inputStates_[iS]->template buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
                         this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(pressedButtons_[iB]));
 
@@ -171,5 +171,5 @@
 
         //! Clears the list of pressed buttons and calls the derived class's method
-        void clearBuffers()
+        void clearBuffers() override
         {
             pressedButtons_.clear();
@@ -180,5 +180,5 @@
         OISDeviceClass* getOISDevice()   { return this->oisDevice_; }
         // Returns the name of the derived class as string
-        std::string getClassName() const { return DeviceClass::getClassNameImpl(); }
+        std::string getClassName() const override { return DeviceClass::getClassNameImpl(); }
 
     protected:
@@ -197,5 +197,5 @@
             // Call states
             for (unsigned int i = 0; i < inputStates_.size(); ++i)
-                inputStates_[i]->buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+                inputStates_[i]->template buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
         }
 
@@ -219,5 +219,5 @@
             // Call states
             for (unsigned int i = 0; i < inputStates_.size(); ++i)
-                inputStates_[i]->buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+                inputStates_[i]->template buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
         }
 
Index: /code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/input/InputManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/input/InputManager.h	(revision 10817)
@@ -208,5 +208,5 @@
 
         // From WindowEventListener
-        void windowFocusChanged(bool bFocus);
+        void windowFocusChanged(bool bFocus) override;
 
     private: // variables
Index: /code/branches/cpp11_v2/src/libraries/core/input/InputState.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/input/InputState.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/input/InputState.h	(revision 10817)
@@ -157,5 +157,5 @@
         ~InputState() { }
 
-        void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
+        void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
 
         //! Sets the priority (only to be used by the InputManager!)
Index: /code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h	(revision 10817)
@@ -77,6 +77,6 @@
 
     private:
-        void calibrationStarted();
-        void calibrationStopped();
+        void calibrationStarted() override;
+        void calibrationStopped() override;
         void evaluateCalibration();
 
@@ -86,5 +86,5 @@
 
         //! OIS event handler
-        bool buttonPressed (const OIS::JoyStickEvent &arg, int button)
+        bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override
         {
             super::buttonPressed(static_cast<JoyStickButtonCode::ByEnum>(button));
@@ -93,5 +93,5 @@
 
         //! OIS event handler
-        bool buttonReleased(const OIS::JoyStickEvent &arg, int button)
+        bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override
         {
             super::buttonReleased(static_cast<JoyStickButtonCode::ByEnum>(button));
@@ -99,9 +99,9 @@
         }
 
-        bool axisMoved     (const OIS::JoyStickEvent &arg, int axis);
-        bool sliderMoved   (const OIS::JoyStickEvent &arg, int id);
-        bool povMoved      (const OIS::JoyStickEvent &arg, int id);
+        bool axisMoved     (const OIS::JoyStickEvent &arg, int axis) override;
+        bool sliderMoved   (const OIS::JoyStickEvent &arg, int id) override;
+        bool povMoved      (const OIS::JoyStickEvent &arg, int id) override;
         //! OIS event handler (don't remove that because of OIS version issues!)
-        bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) { return true; }
+        bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) override { return true; }
 
         //! Returns the class name as string
Index: /code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h	(revision 10817)
@@ -84,26 +84,26 @@
         void compilePointerLists();
         // from JoyStickQuantityListener interface
-        virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
-
-        void allDevicesUpdated(float dt);
-        void mouseUpdated(float dt);
-        void joyStickUpdated(unsigned int joyStick, float dt);
+        virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
+
+        void allDevicesUpdated(float dt) override;
+        void mouseUpdated(float dt) override;
+        void joyStickUpdated(unsigned int joyStick, float dt) override;
         // internal
         void tickHalfAxis(HalfAxis& halfAxis);
 
-        void buttonPressed (const KeyEvent& evt);
-        void buttonReleased(const KeyEvent& evt);
-        void buttonHeld    (const KeyEvent& evt);
-
-        void buttonPressed (MouseButtonCode::ByEnum button);
-        void buttonReleased(MouseButtonCode::ByEnum button);
-        void buttonHeld    (MouseButtonCode::ByEnum button);
-        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
-        void mouseScrolled (int abs, int rel);
-
-        void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button);
-        void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button);
-        void buttonHeld    (unsigned int device, JoyStickButtonCode::ByEnum button);
-        void axisMoved     (unsigned int device, unsigned int axis, float value);
+        void buttonPressed (const KeyEvent& evt) override;
+        void buttonReleased(const KeyEvent& evt) override;
+        void buttonHeld    (const KeyEvent& evt) override;
+
+        void buttonPressed (MouseButtonCode::ByEnum button) override;
+        void buttonReleased(MouseButtonCode::ByEnum button) override;
+        void buttonHeld    (MouseButtonCode::ByEnum button) override;
+        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
+        void mouseScrolled (int abs, int rel) override;
+
+        void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button) override;
+        void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button) override;
+        void buttonHeld    (unsigned int device, JoyStickButtonCode::ByEnum button) override;
+        void axisMoved     (unsigned int device, unsigned int axis, float value) override;
 
     protected: // variables
Index: /code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h	(revision 10817)
@@ -51,5 +51,5 @@
 
         void callback(const std::string& name);
-        void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
+        void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
         void assignCommands();
 
Index: /code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h	(revision 10817)
@@ -75,6 +75,6 @@
         }
 
-        bool keyPressed(const OIS::KeyEvent& arg);
-        bool keyReleased(const OIS::KeyEvent& arg);
+        bool keyPressed(const OIS::KeyEvent& arg) override;
+        bool keyReleased(const OIS::KeyEvent& arg) override;
 
         //! Returns the class name as string
Index: /code/branches/cpp11_v2/src/libraries/core/input/Mouse.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/input/Mouse.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/input/Mouse.h	(revision 10817)
@@ -74,5 +74,5 @@
     private:
         //! OIS event handler
-        bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id)
+        bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
         {
             super::buttonPressed(static_cast<MouseButtonCode::ByEnum>(id));
@@ -81,5 +81,5 @@
 
         //! OIS event handler
-        bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id)
+        bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
         {
             super::buttonReleased(static_cast<MouseButtonCode::ByEnum>(id));
@@ -87,7 +87,7 @@
         }
 
-        bool mouseMoved(const OIS::MouseEvent &arg);
+        bool mouseMoved(const OIS::MouseEvent &arg) override;
 
-        void windowResized(unsigned int newWidth, unsigned int newHeight);
+        void windowResized(unsigned int newWidth, unsigned int newHeight) override;
 
         // Returns the class name as string
Index: /code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandlerIncludes.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandlerIncludes.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandlerIncludes.h	(revision 10817)
@@ -53,6 +53,6 @@
             ~StaticallyInitializedStaticInitializationHandler() { delete handler_; }
 
-            virtual void load();
-            virtual void unload();
+            virtual void load() override;
+            virtual void unload() override;
 
             inline StaticInitializationHandler& getHandler()
Index: /code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h	(revision 10817)
@@ -45,6 +45,6 @@
             virtual ~DestroyLaterManager();
 
-            virtual void preUpdate(const Clock& time) { /*no action*/ }
-            virtual void postUpdate(const Clock& time);
+            virtual void preUpdate(const Clock& time) override { /*no action*/ }
+            virtual void postUpdate(const Clock& time) override;
 
             void retain(Destroyable* instance)
Index: /code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h	(revision 10817)
@@ -175,5 +175,5 @@
                 @param object The object to compare with
             */
-            virtual void removedElement(ObjectListBaseElement* element)
+            virtual void removedElement(ObjectListBaseElement* element) override
             {
                 if (this->element_ == element)
Index: /code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h	(revision 10817)
@@ -82,5 +82,5 @@
             ObjectListElement(T* object) : ObjectListBaseElement(static_cast<Listable*>(object)), object_(object) {}
 
-            virtual void changeContext(Context* oldContext, Context* newContext)
+            virtual void changeContext(Context* oldContext, Context* newContext) override
             {
                 // add object to new context, but only if this element belongs exactly to the old context (and not to a sub-context to avoid re-adding objects
Index: /code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h	(revision 10817)
@@ -230,5 +230,5 @@
         private:
             /// Will be called by Destroyable::~Destroyable() if the stored object is deleted. Resets the wrapped pointer and executes the callback.
-            inline void objectDeleted()
+            inline void objectDeleted() override
             {
                 this->base_ = nullptr;
Index: /code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonIncludes.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonIncludes.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonIncludes.h	(revision 10817)
@@ -87,6 +87,6 @@
             ~StaticallyInitializedScopedSingletonWrapper() { delete wrapper_; }
 
-            virtual void load();
-            virtual void unload();
+            virtual void load() override;
+            virtual void unload() override;
 
             inline ScopedSingletonWrapper& getWrapper()
Index: /code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h	(revision 10817)
@@ -102,5 +102,5 @@
 
         //! Called if the Scope of the Singleton gets active (creates the instance)
-        void activated()
+        void activated() override
         {
             assert(singletonPtr_ == nullptr);
@@ -109,5 +109,5 @@
 
         //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
-        void deactivated()
+        void deactivated() override
         {
             assert(singletonPtr_ != nullptr);
@@ -157,5 +157,5 @@
 
         //! Called if the Scope of the Singleton gets active (creates the instance)
-        void activated()
+        void activated() override
         {
             assert(singletonPtr_ == nullptr);
@@ -169,5 +169,5 @@
 
         //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
-        void deactivated()
+        void deactivated() override
         {
             if (singletonPtr_ != nullptr)
Index: /code/branches/cpp11_v2/src/libraries/network/Client.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/Client.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/Client.h	(revision 10817)
@@ -76,20 +76,20 @@
     static Client* getInstance(){ return singletonPtr_s; } // tolua_export
 
-    bool establishConnection();
+    bool establishConnection() override;
     void setDestination( const std::string& serverAddress, unsigned int port ); // tolua_export
-    bool closeConnection();
-    void queuePacket(ENetPacket* packet, int clientID, uint8_t channelID);
-    virtual bool sendPacket( packet::Packet* packet ){ return packet->send( static_cast<Host*>(this) ); }
-    virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
-    virtual void doReceiveChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
-    virtual void printRTT();
+    bool closeConnection() override;
+    void queuePacket(ENetPacket* packet, int clientID, uint8_t channelID) override;
+    virtual bool sendPacket( packet::Packet* packet ) override{ return packet->send( static_cast<Host*>(this) ); }
+    virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override;
+    virtual void doReceiveChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override;
+    virtual void printRTT() override;
 
     void update(const Clock& time);
   protected:
-    virtual void connectionClosed();
+    virtual void connectionClosed() override;
   private:
     Client(const Client& copy); // not used
-    virtual bool isServer_(){return false;}
-    void processPacket(packet::Packet* packet);
+    virtual bool isServer_() override{return false;}
+    void processPacket(packet::Packet* packet) override;
 
     static Client* singletonPtr_s;
Index: /code/branches/cpp11_v2/src/libraries/network/ClientConnection.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/ClientConnection.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/ClientConnection.h	(revision 10817)
@@ -57,6 +57,6 @@
     uint32_t getRTT();
   private:
-    virtual void addPeer(uint32_t peerID);
-    virtual void removePeer(uint32_t peerID);
+    virtual void addPeer(uint32_t peerID) override;
+    virtual void removePeer(uint32_t peerID) override;
 
     bool disconnectConnection();
Index: /code/branches/cpp11_v2/src/libraries/network/GamestateManager.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/GamestateManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/GamestateManager.h	(revision 10817)
@@ -83,8 +83,8 @@
     ~GamestateManager();
 
-    virtual bool      addGamestate(packet::Gamestate *gs, unsigned int peerID);
-    virtual bool      ackGamestate(unsigned int gamestateID, unsigned int peerID);
-    virtual uint32_t  getLastReceivedGamestateID( unsigned int peerID );
-    virtual uint32_t  getCurrentGamestateID(){ if( currentGamestate_) return currentGamestate_->getID(); else return GAMESTATEID_INITIAL; }
+    virtual bool      addGamestate(packet::Gamestate *gs, unsigned int peerID) override;
+    virtual bool      ackGamestate(unsigned int gamestateID, unsigned int peerID) override;
+    virtual uint32_t  getLastReceivedGamestateID( unsigned int peerID ) override;
+    virtual uint32_t  getCurrentGamestateID() override{ if( currentGamestate_) return currentGamestate_->getID(); else return GAMESTATEID_INITIAL; }
 
     bool processGamestates();
Index: /code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc	(revision 10817)
@@ -109,5 +109,5 @@
       {
         case ENET_EVENT_TYPE_CONNECT:
-            orxout(verbose, context::network) << "Received LAN discovery connect from client " << event.peer->host->receivedAddress << endl;
+            //orxout(verbose, context::network) << "Received LAN discovery connect from client " << event.peer->host->receivedAddress << endl;
             break;
         case ENET_EVENT_TYPE_DISCONNECT:
@@ -117,5 +117,5 @@
           if( strcmp( LAN_DISCOVERY_MESSAGE, (char*)event.packet->data ) == 0 )      // check for a suitable orxonox client
           {
-            orxout(internal_info, context::network) << "Received LAN discovery message from client " << event.peer->host->receivedAddress << endl;
+            //orxout(internal_info, context::network) << "Received LAN discovery message from client " << event.peer->host->receivedAddress << endl;
             packet::ServerInformation info;
             info.setServerName(this->ownName);
Index: /code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h	(revision 10817)
@@ -114,10 +114,10 @@
 
     // ignore the objectID because its a static function
-    virtual bool call(uint32_t objectID){ (*this->functor_)(); return true; }
-    virtual bool call(uint32_t objectID, const MultiType& mt1){ (*this->functor_)(mt1); return true; }
-    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2){ (*this->functor_)(mt1, mt2); return true; }
-    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3){ (*this->functor_)(mt1, mt2, mt3); return true; }
-    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4){ (*this->functor_)(mt1, mt2, mt3, mt4); return true; }
-    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5){ (*this->functor_)(mt1, mt2, mt3, mt4, mt5); return true; }
+    virtual bool call(uint32_t objectID) override{ (*this->functor_)(); return true; }
+    virtual bool call(uint32_t objectID, const MultiType& mt1) override{ (*this->functor_)(mt1); return true; }
+    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2) override{ (*this->functor_)(mt1, mt2); return true; }
+    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3) override{ (*this->functor_)(mt1, mt2, mt3); return true; }
+    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4) override{ (*this->functor_)(mt1, mt2, mt3, mt4); return true; }
+    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5) override{ (*this->functor_)(mt1, mt2, mt3, mt4, mt5); return true; }
 
   private:
@@ -142,5 +142,5 @@
     { }
 
-    inline bool call(uint32_t objectID)
+    inline bool call(uint32_t objectID) override
     {
       if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
@@ -152,5 +152,5 @@
         return false;
     }
-    inline bool call(uint32_t objectID, const MultiType& mt1)
+    inline bool call(uint32_t objectID, const MultiType& mt1) override
     {
       if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
@@ -162,5 +162,5 @@
         return false;
     }
-    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2)
+    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2) override
     {
       if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
@@ -172,5 +172,5 @@
         return false;
     }
-    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
+    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3) override
     {
       if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
@@ -182,5 +182,5 @@
         return false;
     }
-    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
+    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4) override
     {
       if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
@@ -192,5 +192,5 @@
         return false;
     }
-    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
+    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5) override
     {
       if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
Index: /code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h	(revision 10817)
@@ -56,6 +56,6 @@
             ~StaticallyInitializedNetworkFunction() { delete function_; }
 
-            virtual void load();
-            virtual void unload();
+            virtual void load() override;
+            virtual void unload() override;
 
             inline NetworkFunctionBase& getFunction()
Index: /code/branches/cpp11_v2/src/libraries/network/NetworkStaticInitializationHandler.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/NetworkStaticInitializationHandler.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/NetworkStaticInitializationHandler.h	(revision 10817)
@@ -39,9 +39,9 @@
     {
         public:
-            virtual void setupHandler();
-            virtual void shutdownHandler();
+            virtual void setupHandler() override;
+            virtual void shutdownHandler() override;
 
-            virtual void loadModule(ModuleInstance* module);
-            virtual void unloadModule(ModuleInstance* module);
+            virtual void loadModule(ModuleInstance* module) override;
+            virtual void unloadModule(ModuleInstance* module) override;
     };
 }
Index: /code/branches/cpp11_v2/src/libraries/network/Server.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/Server.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/Server.h	(revision 10817)
@@ -61,9 +61,9 @@
     void open();
     void close();
-    void queuePacket(ENetPacket *packet, int clientID, uint8_t channelID);
-    virtual bool sendPacket( packet::Packet* packet ){ return packet->send( static_cast<Host*>(this) ); }
+    void queuePacket(ENetPacket *packet, int clientID, uint8_t channelID) override;
+    virtual bool sendPacket( packet::Packet* packet ) override{ return packet->send( static_cast<Host*>(this) ); }
     void update(const Clock& time);
     unsigned int getRTT(unsigned int clientID);
-    virtual void printRTT();
+    virtual void printRTT() override;
     float getPacketLoss(unsigned int clientID);
     int getClientCount() { return this->clientIDs_.size();}
@@ -73,10 +73,10 @@
     void updateGamestate();
   private:
-    virtual bool isServer_(){return true;}
+    virtual bool isServer_() override{return true;}
     unsigned int playerID(){return 0;}
 
-    void addPeer(uint32_t peerID);
-    void removePeer(uint32_t peerID);
-    void processPacket(packet::Packet* packet);
+    void addPeer(uint32_t peerID) override;
+    void removePeer(uint32_t peerID) override;
+    void processPacket(packet::Packet* packet) override;
 
     bool createClient(int clientID);
@@ -85,6 +85,6 @@
     bool sendObjectDeletes();
     bool isValidTarget(unsigned int targetID);
-    virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
-    virtual void doReceiveChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
+    virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override;
+    virtual void doReceiveChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override;
     void syncClassid(unsigned int clientID);
 
Index: /code/branches/cpp11_v2/src/libraries/network/TrafficControl.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/TrafficControl.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/TrafficControl.h	(revision 10817)
@@ -109,6 +109,6 @@
 
     //ClientConnectionListener functions
-    virtual void clientConnected(unsigned int clientID){};
-    virtual void clientDisconnected(unsigned int clientID);
+    virtual void clientConnected(unsigned int clientID) override{};
+    virtual void clientDisconnected(unsigned int clientID) override;
 
 
Index: /code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h	(revision 10817)
@@ -46,6 +46,6 @@
   ~Acknowledgement();
 
-  inline unsigned int getSize() const;
-  virtual bool process(orxonox::Host* host);
+  inline unsigned int getSize() const override;
+  virtual bool process(orxonox::Host* host) override;
 
   unsigned int getAckID();
Index: /code/branches/cpp11_v2/src/libraries/network/packet/Chat.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/packet/Chat.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/packet/Chat.h	(revision 10817)
@@ -49,8 +49,8 @@
 
   /* get size of packet */
-  inline unsigned int getSize() const;
+  inline unsigned int getSize() const override;
 
   /* process chat message packet and remove it afterwards */
-  virtual bool process(orxonox::Host* host);
+  virtual bool process(orxonox::Host* host) override;
 
   /* Get the length of the message (not the full size of the packet) */
Index: /code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h	(revision 10817)
@@ -47,6 +47,6 @@
   ~ClassID();
 
-  uint32_t getSize() const;
-  virtual bool process(orxonox::Host* host);
+  uint32_t getSize() const override;
+  virtual bool process(orxonox::Host* host) override;
 
 private:
Index: /code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.h	(revision 10817)
@@ -48,6 +48,6 @@
   bool fetchIDs();
 
-  inline unsigned int getSize() const;
-  virtual bool process(orxonox::Host* host);
+  inline unsigned int getSize() const override;
+  virtual bool process(orxonox::Host* host) override;
 
 private:
Index: /code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.h	(revision 10817)
@@ -52,10 +52,10 @@
   ~FunctionCalls();
 
-  inline unsigned int getSize() const
+  inline unsigned int getSize() const override
     { assert(!this->isDataENetAllocated()); return currentSize_; }
-  virtual bool process(orxonox::Host* host);
+  virtual bool process(orxonox::Host* host) override;
 
   void addCall( uint32_t networkID, uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5);
-  virtual bool send(orxonox::Host* host);
+  virtual bool send(orxonox::Host* host) override;
 private:
   std::queue<orxonox::FunctionCall> functionCalls_;
Index: /code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.h	(revision 10817)
@@ -47,6 +47,6 @@
   ~FunctionIDs();
 
-  virtual uint32_t getSize() const;
-  virtual bool process(orxonox::Host* host);
+  virtual uint32_t getSize() const override;
+  virtual bool process(orxonox::Host* host) override;
 
 private:
Index: /code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h	(revision 10817)
@@ -138,6 +138,6 @@
 //     void rawDiff( uint8_t* newdata, uint8_t* data, uint8_t* basedata, uint32_t datalength, uint32_t baselength);
 //     inline uint32_t findObject( const SynchronisableHeader& header, uint8_t* mem, uint32_t dataLength, uint32_t startPosition = 0 );
-    virtual uint32_t getSize() const;
-    virtual bool process(orxonox::Host* host);
+    virtual uint32_t getSize() const override;
+    virtual bool process(orxonox::Host* host) override;
     uint32_t calcGamestateSize(uint32_t id, uint8_t mode=0x0);
 //     inline void diffObject( uint8_t*& newData, uint8_t*& origData, uint8_t*& baseData, SynchronisableHeader& objectHeader, std::vector<uint32_t>::iterator& sizes );
Index: /code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h	(revision 10817)
@@ -45,7 +45,7 @@
   virtual ~Welcome();
 
-  uint8_t *getData();
-  inline unsigned int getSize() const;
-  virtual bool process(orxonox::Host* host);
+  uint8_t *getData() override;
+  inline unsigned int getSize() const override;
+  virtual bool process(orxonox::Host* host) override;
 
 private:
Index: /code/branches/cpp11_v2/src/libraries/network/synchronisable/NetworkCallback.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/synchronisable/NetworkCallback.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/synchronisable/NetworkCallback.h	(revision 10817)
@@ -53,5 +53,5 @@
       NetworkCallback(T* object, void (T::*function) (void)) : object_(object), function_(function) {}
       virtual ~NetworkCallback() {}
-      virtual void call()
+      virtual void call() override
         { (this->object_->*function_)(); }
 
@@ -68,5 +68,5 @@
       NetworkCallbackNotify() {}
       virtual ~NetworkCallbackNotify() {}
-      virtual void call()
+      virtual void call() override
         { (this->object_->*function_)( this->oldValue_ ); }
       void setOldValue(const U& value){ this->oldValue_ = value; }
Index: /code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h	(revision 10817)
@@ -74,9 +74,9 @@
       virtual ~SynchronisableVariable();
 
-      virtual inline uint8_t getMode(){ return mode_; }
-      virtual inline uint32_t getData(uint8_t*& mem, uint8_t mode);
-      virtual inline void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false);
-      virtual inline uint32_t getSize(uint8_t mode);
-      virtual inline void* getReference(){ return static_cast<void*>(const_cast<typename Loki::TypeTraits<T>::UnqualifiedType*>(&this->variable_)); }
+      virtual inline uint8_t getMode() override{ return mode_; }
+      virtual inline uint32_t getData(uint8_t*& mem, uint8_t mode) override;
+      virtual inline void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false) override;
+      virtual inline uint32_t getSize(uint8_t mode) override;
+      virtual inline void* getReference() override{ return static_cast<void*>(const_cast<typename Loki::TypeTraits<T>::UnqualifiedType*>(&this->variable_)); }
     protected:
       T&                       variable_;
Index: /code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h	(revision 10817)
@@ -23,27 +23,27 @@
             BulletDebugDrawer(Ogre::SceneManager* sceneManager);
             ~BulletDebugDrawer();
-            virtual void drawLine(const btVector3& from, const btVector3& to, const btVector3& color);
+            virtual void drawLine(const btVector3& from, const btVector3& to, const btVector3& color) override;
 //            virtual void drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar);
-            virtual void drawSphere (const btVector3& p, btScalar radius, const btVector3& color);
-            virtual void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color);
-            virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btVector3& color);
-            virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btTransform& trans, const btVector3& color);
-            virtual void drawCylinder(btScalar radius, btScalar halfHeight, int upAxis, const btTransform& transform, const btVector3& color);
-            virtual void drawCone(btScalar radius, btScalar height, int upAxis, const btTransform& transform, const btVector3& color);
+            virtual void drawSphere (const btVector3& p, btScalar radius, const btVector3& color) override;
+            virtual void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color) override;
+            virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btVector3& color) override;
+            virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btTransform& trans, const btVector3& color) override;
+            virtual void drawCylinder(btScalar radius, btScalar halfHeight, int upAxis, const btTransform& transform, const btVector3& color) override;
+            virtual void drawCone(btScalar radius, btScalar height, int upAxis, const btTransform& transform, const btVector3& color) override;
 //            virtual void drawPlane(const btVector3& planeNormal, btScalar planeConst, const btTransform& transform, const btVector3& color);
 
-            virtual void drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime, const btVector3& color);
+            virtual void drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime, const btVector3& color) override;
 
-            virtual void reportErrorWarning(const char* warningString);
-            virtual void draw3dText(const btVector3& location, const char* textString);
+            virtual void reportErrorWarning(const char* warningString) override;
+            virtual void draw3dText(const btVector3& location, const char* textString) override;
 
-            virtual void setDebugMode(int debugMode);
-            virtual int getDebugMode() const;
+            virtual void setDebugMode(int debugMode) override;
+            virtual int getDebugMode() const override;
 
             void configure(bool bFill, float fillAlpha);
 
         protected:
-            bool frameStarted(const Ogre::FrameEvent& evt);
-            bool frameEnded(const Ogre::FrameEvent& evt);
+            bool frameStarted(const Ogre::FrameEvent& evt) override;
+            bool frameEnded(const Ogre::FrameEvent& evt) override;
 
         private:
Index: /code/branches/cpp11_v2/src/libraries/tools/DynamicLines.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/tools/DynamicLines.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/tools/DynamicLines.h	(revision 10817)
@@ -84,7 +84,7 @@
     protected:
         /// Implementation DynamicRenderable, creates a simple vertex-only decl
-        virtual void createVertexDeclaration();
+        virtual void createVertexDeclaration() override;
         /// Implementation DynamicRenderable, pushes point list out to hardware memory
-        virtual void fillHardwareBuffers();
+        virtual void fillHardwareBuffers() override;
 
     private:
Index: /code/branches/cpp11_v2/src/libraries/tools/DynamicRenderable.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/tools/DynamicRenderable.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/tools/DynamicRenderable.h	(revision 10817)
@@ -61,7 +61,7 @@
 
         /// Implementation of SimpleRenderable
-        virtual Real getBoundingRadius(void) const;
+        virtual Real getBoundingRadius(void) const override;
         /// Implementation of SimpleRenderable
-        virtual Real getSquaredViewDepth(const Camera* cam) const;
+        virtual Real getSquaredViewDepth(const Camera* cam) const override;
 
     protected:
Index: /code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.h	(revision 10817)
@@ -76,5 +76,5 @@
 
         protected:
-            virtual void changedTimeFactor(float factor_new, float factor_old);
+            virtual void changedTimeFactor(float factor_new, float factor_old) override;
 
         private:
Index: /code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h	(revision 10817)
@@ -44,5 +44,5 @@
         virtual ~ResourceCollection();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void setResourceGroup(const std::string& resourceGroup);
Index: /code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h	(revision 10817)
@@ -46,5 +46,5 @@
         virtual ~ResourceLocation();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void setPath(const std::string& path) { path_ = path; }
Index: /code/branches/cpp11_v2/src/libraries/tools/Shader.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/tools/Shader.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/tools/Shader.h	(revision 10817)
@@ -87,10 +87,10 @@
                 { return this->scenemanager_; }
 
-            virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera);
+            virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera) override;
 
             void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, float value);
             void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, int value);
 
-            virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr);
+            virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr) override;
 
         private:
Index: /code/branches/cpp11_v2/src/libraries/tools/Timer.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/tools/Timer.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/tools/Timer.h	(revision 10817)
@@ -175,5 +175,5 @@
 
         protected:
-            virtual float getTimeFactor();
+            virtual float getTimeFactor() override;
     };
 }
Index: /code/branches/cpp11_v2/src/libraries/util/ExprParser.cc
===================================================================
--- /code/branches/cpp11_v2/src/libraries/util/ExprParser.cc	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/util/ExprParser.cc	(revision 10817)
@@ -402,5 +402,5 @@
             {
                 this->failed_ = true;
-                return '\0';
+                return str;
             }
         };
Index: /code/branches/cpp11_v2/src/libraries/util/MultiType.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/util/MultiType.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/util/MultiType.h	(revision 10817)
@@ -428,5 +428,5 @@
             }
             /// Creates a new value container (works only with specialized types).
-            template <typename T> inline void createNewValueContainer(const T& value) { /* STATIC ASSERT */ *****value; return false; }
+            template <typename T> inline void createNewValueContainer(const T& value) { /* STATIC ASSERT */ *****value; }
 
             MT_ValueBase* value_; //!< A pointer to the value container
Index: /code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h	(revision 10817)
@@ -58,32 +58,32 @@
 
         /// Creates a copy of itself.
-        inline MT_ValueBase* clone() const { return new MT_Value<T>(this->value_, this->type_); }
+        inline MT_ValueBase* clone() const override { return new MT_Value<T>(this->value_, this->type_); }
 
         /// Resets the current value to the default.
-        inline void reset() { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; }
-
-        inline bool getValue(char*                 value) const { return convertValue<T, char                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(unsigned char*        value) const { return convertValue<T, unsigned char       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(short*                value) const { return convertValue<T, short               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(unsigned short*       value) const { return convertValue<T, unsigned short      >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(int*                  value) const { return convertValue<T, int                 >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(unsigned int*         value) const { return convertValue<T, unsigned int        >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(long*                 value) const { return convertValue<T, long                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(unsigned long*        value) const { return convertValue<T, unsigned long       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(long long*            value) const { return convertValue<T, long long           >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(unsigned long long*   value) const { return convertValue<T, unsigned long long  >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(float*                value) const { return convertValue<T, float               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(double*               value) const { return convertValue<T, double              >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(long double*          value) const { return convertValue<T, long double         >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(bool*                 value) const { return convertValue<T, bool                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(void**                value) const { return convertValue<T, void*               >(value, value_, nullptr); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(std::string*          value) const { return convertValue<T, std::string         >(value, value_, NilValue<std::string>         ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(orxonox::Vector2*     value) const { return convertValue<T, orxonox::Vector2    >(value, value_, NilValue<orxonox::Vector2>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(orxonox::Vector3*     value) const { return convertValue<T, orxonox::Vector3    >(value, value_, NilValue<orxonox::Vector3>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(orxonox::Vector4*     value) const { return convertValue<T, orxonox::Vector4    >(value, value_, NilValue<orxonox::Vector4>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(orxonox::ColourValue* value) const { return convertValue<T, orxonox::ColourValue>(value, value_, NilValue<orxonox::ColourValue>()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(orxonox::Quaternion*  value) const { return convertValue<T, orxonox::Quaternion >(value, value_, NilValue<orxonox::Quaternion> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(orxonox::Radian*      value) const { return convertValue<T, orxonox::Radian     >(value, value_, NilValue<orxonox::Radian>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
-        inline bool getValue(orxonox::Degree*      value) const { return convertValue<T, orxonox::Degree     >(value, value_, NilValue<orxonox::Degree>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline void reset() override { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; }
+
+        inline bool getValue(char*                 value) const override { return convertValue<T, char                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(unsigned char*        value) const override { return convertValue<T, unsigned char       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(short*                value) const override { return convertValue<T, short               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(unsigned short*       value) const override { return convertValue<T, unsigned short      >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(int*                  value) const override { return convertValue<T, int                 >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(unsigned int*         value) const override { return convertValue<T, unsigned int        >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(long*                 value) const override { return convertValue<T, long                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(unsigned long*        value) const override { return convertValue<T, unsigned long       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(long long*            value) const override { return convertValue<T, long long           >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(unsigned long long*   value) const override { return convertValue<T, unsigned long long  >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(float*                value) const override { return convertValue<T, float               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(double*               value) const override { return convertValue<T, double              >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(long double*          value) const override { return convertValue<T, long double         >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(bool*                 value) const override { return convertValue<T, bool                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(void**                value) const override { return convertValue<T, void*               >(value, value_, nullptr); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(std::string*          value) const override { return convertValue<T, std::string         >(value, value_, NilValue<std::string>         ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(orxonox::Vector2*     value) const override { return convertValue<T, orxonox::Vector2    >(value, value_, NilValue<orxonox::Vector2>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(orxonox::Vector3*     value) const override { return convertValue<T, orxonox::Vector3    >(value, value_, NilValue<orxonox::Vector3>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(orxonox::Vector4*     value) const override { return convertValue<T, orxonox::Vector4    >(value, value_, NilValue<orxonox::Vector4>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(orxonox::ColourValue* value) const override { return convertValue<T, orxonox::ColourValue>(value, value_, NilValue<orxonox::ColourValue>()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(orxonox::Quaternion*  value) const override { return convertValue<T, orxonox::Quaternion >(value, value_, NilValue<orxonox::Quaternion> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(orxonox::Radian*      value) const override { return convertValue<T, orxonox::Radian     >(value, value_, NilValue<orxonox::Radian>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+        inline bool getValue(orxonox::Degree*      value) const override { return convertValue<T, orxonox::Degree     >(value, value_, NilValue<orxonox::Degree>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
 
         /**
@@ -91,5 +91,5 @@
             @param other The other MultiType
         */
-        inline bool setValue(const MultiType& other)
+        inline bool setValue(const MultiType& other) override
         {
             if (other.value_)
@@ -104,37 +104,37 @@
         }
 
-        inline bool setValue(const char& value)                 { return (bLastConversionSuccessful = convertValue<char                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const unsigned char& value)        { return (bLastConversionSuccessful = convertValue<unsigned char       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const short& value)                { return (bLastConversionSuccessful = convertValue<short               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const unsigned short& value)       { return (bLastConversionSuccessful = convertValue<unsigned short      , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const int& value)                  { return (bLastConversionSuccessful = convertValue<int                 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const unsigned int& value)         { return (bLastConversionSuccessful = convertValue<unsigned int        , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const long& value)                 { return (bLastConversionSuccessful = convertValue<long                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const unsigned long& value)        { return (bLastConversionSuccessful = convertValue<unsigned long       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const long long& value)            { return (bLastConversionSuccessful = convertValue<long long           , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const unsigned long long& value)   { return (bLastConversionSuccessful = convertValue<unsigned long long  , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const float& value)                { return (bLastConversionSuccessful = convertValue<float               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const double& value)               { return (bLastConversionSuccessful = convertValue<double              , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const long double& value)          { return (bLastConversionSuccessful = convertValue<long double         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const bool& value)                 { return (bLastConversionSuccessful = convertValue<bool                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(      void* const& value)          { return (bLastConversionSuccessful = convertValue<void*               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const std::string& value)          { return (bLastConversionSuccessful = convertValue<std::string         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const orxonox::Vector2& value)     { return (bLastConversionSuccessful = convertValue<orxonox::Vector2    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const orxonox::Vector3& value)     { return (bLastConversionSuccessful = convertValue<orxonox::Vector3    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const orxonox::Vector4& value)     { return (bLastConversionSuccessful = convertValue<orxonox::Vector4    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const orxonox::ColourValue& value) { return (bLastConversionSuccessful = convertValue<orxonox::ColourValue, T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const orxonox::Quaternion& value)  { return (bLastConversionSuccessful = convertValue<orxonox::Quaternion , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const orxonox::Radian& value)      { return (bLastConversionSuccessful = convertValue<orxonox::Radian     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
-        inline bool setValue(const orxonox::Degree& value)      { return (bLastConversionSuccessful = convertValue<orxonox::Degree     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const char& value) override                 { return (bLastConversionSuccessful = convertValue<char                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const unsigned char& value) override        { return (bLastConversionSuccessful = convertValue<unsigned char       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const short& value) override                { return (bLastConversionSuccessful = convertValue<short               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const unsigned short& value) override       { return (bLastConversionSuccessful = convertValue<unsigned short      , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const int& value) override                  { return (bLastConversionSuccessful = convertValue<int                 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const unsigned int& value) override         { return (bLastConversionSuccessful = convertValue<unsigned int        , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const long& value) override                 { return (bLastConversionSuccessful = convertValue<long                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const unsigned long& value) override        { return (bLastConversionSuccessful = convertValue<unsigned long       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const long long& value) override            { return (bLastConversionSuccessful = convertValue<long long           , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const unsigned long long& value) override   { return (bLastConversionSuccessful = convertValue<unsigned long long  , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const float& value) override                { return (bLastConversionSuccessful = convertValue<float               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const double& value) override               { return (bLastConversionSuccessful = convertValue<double              , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const long double& value) override          { return (bLastConversionSuccessful = convertValue<long double         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const bool& value) override                 { return (bLastConversionSuccessful = convertValue<bool                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(      void* const& value) override          { return (bLastConversionSuccessful = convertValue<void*               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const std::string& value) override          { return (bLastConversionSuccessful = convertValue<std::string         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const orxonox::Vector2& value) override     { return (bLastConversionSuccessful = convertValue<orxonox::Vector2    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const orxonox::Vector3& value) override     { return (bLastConversionSuccessful = convertValue<orxonox::Vector3    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const orxonox::Vector4& value) override     { return (bLastConversionSuccessful = convertValue<orxonox::Vector4    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const orxonox::ColourValue& value) override { return (bLastConversionSuccessful = convertValue<orxonox::ColourValue, T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const orxonox::Quaternion& value) override  { return (bLastConversionSuccessful = convertValue<orxonox::Quaternion , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const orxonox::Radian& value) override      { return (bLastConversionSuccessful = convertValue<orxonox::Radian     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+        inline bool setValue(const orxonox::Degree& value) override      { return (bLastConversionSuccessful = convertValue<orxonox::Degree     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
 
         /// Puts the current value on the stream
-        inline void toString(std::ostream& outstream) const { outstream << this->value_; }
+        inline void toString(std::ostream& outstream) const override { outstream << this->value_; }
 
         /// loads data from the bytestream (mem) into the MT and increases the bytestream pointer by the size of the data
-        inline void importData( uint8_t*& mem )         { loadAndIncrease( /*(const T&)*/this->value_, mem ); }
+        inline void importData( uint8_t*& mem ) override         { loadAndIncrease( /*(const T&)*/this->value_, mem ); }
         /// saves data from the MT into the bytestream (mem) and increases the bytestream pointer by the size of the data
-        inline void exportData( uint8_t*& mem ) const   { saveAndIncrease( /*(const T&)*/this->value_, mem ); }
+        inline void exportData( uint8_t*& mem ) const override   { saveAndIncrease( /*(const T&)*/this->value_, mem ); }
         /// returns the size of the data that would be saved by exportData
-        inline uint8_t getSize() const { return returnSize( this->value_ ); }
+        inline uint8_t getSize() const override { return returnSize( this->value_ ); }
 
         T value_; ///< The stored value
Index: /code/branches/cpp11_v2/src/libraries/util/SharedPtr.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/util/SharedPtr.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/util/SharedPtr.h	(revision 10817)
@@ -176,5 +176,5 @@
                 SharedCounterImpl(T* pointer) : pointer_(pointer) {}
 
-                void destroy()
+                void destroy() override
                 {
                     delete this->pointer_;
Index: /code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.h	(revision 10817)
@@ -103,5 +103,5 @@
 
         protected:
-            virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines);
+            virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines) override;
 
         private:
Index: /code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h	(revision 10817)
@@ -63,5 +63,5 @@
 
         protected:
-            virtual void printLine(const std::string& line, OutputLevel level);
+            virtual void printLine(const std::string& line, OutputLevel level) override;
 
         private:
Index: /code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h	(revision 10817)
@@ -70,5 +70,5 @@
 
         protected:
-            virtual void printLine(const std::string& line, OutputLevel level);
+            virtual void printLine(const std::string& line, OutputLevel level) override;
 
         private:
Index: /code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h	(revision 10817)
@@ -75,5 +75,5 @@
 
         protected:
-            virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines);
+            virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines) override;
 
         private:
Index: /code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h	(revision 10817)
@@ -81,9 +81,9 @@
             virtual void unregisterListener(OutputListener* listener);
 
-            virtual void updatedLevelMask(const OutputListener* listener)
+            virtual void updatedLevelMask(const OutputListener* listener) override
                 { this->updateCombinedLevelMask(); }
-            virtual void updatedAdditionalContextsLevelMask(const OutputListener* listener)
+            virtual void updatedAdditionalContextsLevelMask(const OutputListener* listener) override
                 { this->updateCombinedAdditionalContextsLevelMask(); }
-            virtual void updatedAdditionalContextsMask(const OutputListener* listener)
+            virtual void updatedAdditionalContextsMask(const OutputListener* listener) override
                 { this->updateCombinedAdditionalContextsMask(); }
 
Index: /code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.h
===================================================================
--- /code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.h	(revision 10817)
@@ -73,8 +73,8 @@
             virtual ~SubcontextOutputListener();
 
-            virtual void setAdditionalContextsMask(OutputContextMask mask);
+            virtual void setAdditionalContextsMask(OutputContextMask mask) override;
             void setAdditionalSubcontexts(const std::set<const OutputContextContainer*>& subcontexts);
 
-            virtual bool acceptsOutput(OutputLevel level, const OutputContextContainer& context) const;
+            virtual bool acceptsOutput(OutputLevel level, const OutputContextContainer& context) const override;
 
             inline const std::set<OutputContextSubID>& getSubcontexts() const
Index: /code/branches/cpp11_v2/src/modules/designtools/CreateStars.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/designtools/CreateStars.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/designtools/CreateStars.h	(revision 10817)
@@ -43,5 +43,5 @@
             void createBillboards();
 
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void setNumStars(int num) {
Index: /code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h	(revision 10817)
@@ -65,5 +65,5 @@
             SkyboxGenerator();
             virtual ~SkyboxGenerator();
-            void tick(float dt); // This is where the skybox generation happens.
+            void tick(float dt) override; // This is where the skybox generation happens.
             static void createSkybox(void); // Generate the 6 faces of a skybox.
             void setConfigValues(void); // Sets some config values.
Index: /code/branches/cpp11_v2/src/modules/docking/Dock.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/docking/Dock.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/docking/Dock.h	(revision 10817)
@@ -65,6 +65,6 @@
 
             // XML interface
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             // XML functions
Index: /code/branches/cpp11_v2/src/modules/docking/DockToShip.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/docking/DockToShip.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/docking/DockToShip.h	(revision 10817)
@@ -60,10 +60,10 @@
             virtual ~DockToShip();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             void setTargetId(const std::string& str);
             const std::string& getTargetId() const;
 
-            virtual bool docking(PlayerInfo* player); //!< Called when docking starts
-            virtual bool release(PlayerInfo* player); //!< Called when player wants undock
+            virtual bool docking(PlayerInfo* player) override; //!< Called when docking starts
+            virtual bool release(PlayerInfo* player) override; //!< Called when player wants undock
         private:
             std::string target_;
Index: /code/branches/cpp11_v2/src/modules/docking/DockingController.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/docking/DockingController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/docking/DockingController.h	(revision 10817)
@@ -45,5 +45,5 @@
             virtual ~DockingController();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             void takeControl(bool docking);
@@ -53,5 +53,5 @@
 
         protected:
-            virtual void positionReached();
+            virtual void positionReached() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/docking/DockingTarget.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/docking/DockingTarget.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/docking/DockingTarget.h	(revision 10817)
@@ -58,5 +58,5 @@
             virtual ~DockingTarget();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
     };
Index: /code/branches/cpp11_v2/src/modules/docking/MoveToDockingTarget.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/docking/MoveToDockingTarget.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/docking/MoveToDockingTarget.h	(revision 10817)
@@ -59,6 +59,6 @@
             virtual ~MoveToDockingTarget();
 
-            virtual bool docking(PlayerInfo* player); //!< Called when a player starts docking
-            virtual bool release(PlayerInfo* player); //!< Called when player wants to undock
+            virtual bool docking(PlayerInfo* player) override; //!< Called when a player starts docking
+            virtual bool release(PlayerInfo* player) override; //!< Called when player wants to undock
     };
 
Index: /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h	(revision 10817)
@@ -69,10 +69,10 @@
             DodgeRace(Context* context);
 
-            virtual void start();
-            virtual void end();
+            virtual void start() override;
+            virtual void end() override;
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void playerPreSpawn(PlayerInfo* player);
+            virtual void playerPreSpawn(PlayerInfo* player) override;
 
             void levelUp();
@@ -85,5 +85,5 @@
             void setCenterpoint(DodgeRaceCenterPoint* center)
                        { this->center_ = center; }
-            virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
 
             // checks if multiplier should be reset.
Index: /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h	(revision 10817)
@@ -50,5 +50,5 @@
             DodgeRaceCenterPoint(Context* context); //checks whether the gametype is actually DodgeRace.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h	(revision 10817)
@@ -44,7 +44,7 @@
             DodgeRaceHUDinfo(Context* context);
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowPoints(bool value)
Index: /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h	(revision 10817)
@@ -52,19 +52,19 @@
             DodgeRaceShip(Context* context);
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             // overwrite for 2d movement
-            virtual void moveFrontBack(const Vector2& value);
-            virtual void moveRightLeft(const Vector2& value);
+            virtual void moveFrontBack(const Vector2& value) override;
+            virtual void moveRightLeft(const Vector2& value) override;
 
             // Starts or stops fireing
-            virtual void boost(bool bBoost);
+            virtual void boost(bool bBoost) override;
 
             //no rotation!
-            virtual void rotateYaw(const Vector2& value){};
-            virtual void rotatePitch(const Vector2& value){};
+            virtual void rotateYaw(const Vector2& value) override{};
+            virtual void rotatePitch(const Vector2& value) override{};
 
             //return to main menu if game has ended.
-            virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+            virtual void rotateRoll(const Vector2& value) override{if (getGame()) if (getGame()->bEndGame) getGame()->end();};
 
             virtual void updateLevel();
@@ -74,5 +74,5 @@
 
         protected:
-            virtual void death();
+            virtual void death() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h	(revision 10817)
@@ -48,9 +48,9 @@
             virtual ~OldRaceCheckPoint();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
 
             protected:
-            virtual void triggered(bool bIsTriggered);
+            virtual void triggered(bool bIsTriggered) override;
             inline void setLast(bool isLast)
                 { this->bIsLast_ = isLast; }
@@ -64,5 +64,5 @@
             inline float getTimeLimit()
                 { return this->bTimeLimit_;}
-            inline const WorldEntity* getWorldEntity() const
+            inline const WorldEntity* getWorldEntity() const override
                 { return this; }
 
Index: /code/branches/cpp11_v2/src/modules/gametypes/OldSpaceRace.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/gametypes/OldSpaceRace.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/gametypes/OldSpaceRace.h	(revision 10817)
@@ -55,9 +55,9 @@
             virtual ~OldSpaceRace() {}
 
-            virtual void start();
-            virtual void end();
+            virtual void start() override;
+            virtual void end() override;
 
             virtual void newCheckpointReached();
-            virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command.
+            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command.
                                                         //<! This is only a temporary solution. Better: create racingBots.
 
Index: /code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h	(revision 10817)
@@ -48,5 +48,5 @@
             virtual ~RaceCheckPoint();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline void setCheckpointIndex(int checkpointIndex)
@@ -92,7 +92,7 @@
         protected:
 
-            virtual void fire(bool bIsTriggered, BaseObject* originator);
+            virtual void fire(bool bIsTriggered, BaseObject* originator) override;
 
-            inline const WorldEntity* getWorldEntity() const
+            inline const WorldEntity* getWorldEntity() const override
             {
                 return this;
Index: /code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h	(revision 10817)
@@ -57,7 +57,7 @@
             virtual ~SpaceRace() {}
 
-            void tick(float dt);
+            void tick(float dt) override;
 
-            virtual void end();
+            virtual void end() override;
 
             void newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player);
@@ -70,7 +70,7 @@
                 { return this->clock_; }
 
-            bool allowPawnHit(Pawn* victim, Pawn* originator);
-            bool allowPawnDamage(Pawn* victim, Pawn* originator);
-            bool allowPawnDeath(Pawn* victim, Pawn* originator);
+            bool allowPawnHit(Pawn* victim, Pawn* originator) override;
+            bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
+            bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.h	(revision 10817)
@@ -42,6 +42,6 @@
             SpaceRaceController(Context* context);
             virtual ~SpaceRaceController();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h	(revision 10817)
@@ -58,5 +58,5 @@
             virtual ~SpaceRaceManager() ;
 
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void addCheckpoint(RaceCheckPoint* checkpoint);
@@ -69,5 +69,5 @@
             std::vector<RaceCheckPoint*> getAllCheckpoints();
 
-            void tick(float dt);
+            void tick(float dt) override;
 
         protected:
Index: /code/branches/cpp11_v2/src/modules/invader/Invader.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/invader/Invader.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/invader/Invader.h	(revision 10817)
@@ -49,7 +49,7 @@
             Invader(Context* context);
 
-            virtual void start();
-            virtual void end();
-            virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+            virtual void start() override;
+            virtual void end() override;
+            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
 
             void spawnEnemy();
Index: /code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h	(revision 10817)
@@ -47,5 +47,5 @@
             InvaderCenterPoint(Context* context); //checks whether the gametype is actually Invader.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h	(revision 10817)
@@ -46,7 +46,7 @@
             InvaderEnemy(Context* context);
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
+            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
             virtual void setPlayer(InvaderShip* player){this->player = player;}
 
Index: /code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h	(revision 10817)
@@ -47,6 +47,6 @@
             InvaderEnemyShooter(Context* context);
 
-            virtual void tick(float dt);
-            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
+            virtual void tick(float dt) override;
+            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
         protected:
             void shoot();
Index: /code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h	(revision 10817)
@@ -40,7 +40,7 @@
             InvaderHUDinfo(Context* context);
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowLives(bool value)
Index: /code/branches/cpp11_v2/src/modules/invader/InvaderShip.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/invader/InvaderShip.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/invader/InvaderShip.h	(revision 10817)
@@ -47,18 +47,18 @@
             InvaderShip(Context* context);
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             // overwrite for 2d movement
-            virtual void moveFrontBack(const Vector2& value);
-            virtual void moveRightLeft(const Vector2& value);
+            virtual void moveFrontBack(const Vector2& value) override;
+            virtual void moveRightLeft(const Vector2& value) override;
 
             // Starts or stops fireing
-            virtual void boost(bool bBoost);
+            virtual void boost(bool bBoost) override;
 
             //no rotation!
-            virtual void rotateYaw(const Vector2& value){}; 
-            virtual void rotatePitch(const Vector2& value){};
+            virtual void rotateYaw(const Vector2& value) override{}; 
+            virtual void rotatePitch(const Vector2& value) override{};
             //return to main menu if game has ended.
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotateRoll(const Vector2& value) override;
 
             virtual void updateLevel();
@@ -67,5 +67,5 @@
 
         protected:
-            virtual void death();
+            virtual void death() override;
         private:
             Invader* getGame();
Index: /code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h	(revision 10817)
@@ -48,5 +48,5 @@
             virtual ~InvaderWeapon();
         protected:
-            virtual void shot();
+            virtual void shot() override;
             WeakPtr<Projectile> projectile;
     };
Index: /code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h	(revision 10817)
@@ -47,5 +47,5 @@
             InvaderWeaponEnemy(Context* context);
         protected:
-            virtual void shot();
+            virtual void shot() override;
     };
 }
Index: /code/branches/cpp11_v2/src/modules/jump/Jump.cc
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/Jump.cc	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/Jump.cc	(revision 10817)
@@ -98,5 +98,5 @@
                 if (screenShiftSinceLastUpdate_ > center_->getSectionLength())
                 {
-                    if (sectionNumber_ > 2 && sectionNumber_%4 == 0 && rand()%2 == 0 && figure_->propellerActive_ == false && figure_->rocketActive_ == false && addAdventure(adventureNumber_) == true)
+                    if (sectionNumber_ > 2 && sectionNumber_%4 == 0 && rand()%2 == 0 && figure_->propellerActive_ == nullptr && figure_->rocketActive_ == nullptr && addAdventure(adventureNumber_) == true)
                     {
                         screenShiftSinceLastUpdate_ -= 2*center_->getSectionLength();
Index: /code/branches/cpp11_v2/src/modules/jump/Jump.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/Jump.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/Jump.h	(revision 10817)
@@ -40,8 +40,8 @@
             Jump(Context* context);
             virtual ~Jump();
-            virtual void tick(float dt);
-            virtual void start();
-            virtual void end();
-            virtual void spawnPlayer(PlayerInfo* player);
+            virtual void tick(float dt) override;
+            virtual void start() override;
+            virtual void end() override;
+            virtual void spawnPlayer(PlayerInfo* player) override;
             int getScore(PlayerInfo* player) const;
             float getFuel() const;
Index: /code/branches/cpp11_v2/src/modules/jump/JumpBoots.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpBoots.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpBoots.h	(revision 10817)
@@ -40,7 +40,7 @@
             JumpBoots(Context* context);
             virtual ~JumpBoots();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void touchFigure();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void touchFigure() override;
             virtual float getFuelState();
         protected:
Index: /code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h	(revision 10817)
@@ -108,5 +108,5 @@
             JumpCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Jump.
             virtual ~JumpCenterpoint() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a JumpCenterpoint through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a JumpCenterpoint through XML.
             void setPlatformStaticTemplate(const std::string& balltemplate)
                 { this->platformStaticTemplate_ = balltemplate; }
Index: /code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h	(revision 10817)
@@ -46,6 +46,6 @@
             JumpEnemy(Context* context);
             virtual ~JumpEnemy();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             void setFieldDimension(float width, float height)
                 { this->fieldWidth_ = width; this->fieldHeight_ = height; }
Index: /code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc	(revision 10817)
@@ -319,5 +319,5 @@
     bool JumpFigure::StartShield(JumpShield* shield)
     {
-        if (shieldActive_ == false)
+        if (shieldActive_ == nullptr)
         {
             attach(shield);
Index: /code/branches/cpp11_v2/src/modules/jump/JumpFigure.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpFigure.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpFigure.h	(revision 10817)
@@ -40,13 +40,13 @@
             JumpFigure(Context* context); //!< Constructor. Registers and initializes the object.
             virtual ~JumpFigure() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
-            virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
+            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
             void fire(unsigned int firemode);
-            virtual void fired(unsigned int firemode);
+            virtual void fired(unsigned int firemode) override;
             virtual void JumpFromPlatform(JumpPlatform* platform);
             virtual void JumpFromSpring(JumpSpring* spring);
Index: /code/branches/cpp11_v2/src/modules/jump/JumpItem.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpItem.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpItem.h	(revision 10817)
@@ -47,6 +47,6 @@
             JumpItem(Context* context);
             virtual ~JumpItem();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void setProperties(float newLeftBoundary, float newRightBoundary, float newLowerBoundary, float newUpperBoundary, float newHSpeed, float newVSpeed);
             virtual void setFigure(JumpFigure* newFigure);
Index: /code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h	(revision 10817)
@@ -46,6 +46,6 @@
             JumpPlatform(Context* context);
             virtual ~JumpPlatform();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             void setFigure(JumpFigure* newFigure);
             virtual void touchFigure();
Index: /code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h	(revision 10817)
@@ -46,9 +46,9 @@
             JumpPlatformDisappear(Context* context);
             virtual ~JumpPlatformDisappear();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void setProperties(bool active);
             virtual bool isActive();
-            virtual void touchFigure();
+            virtual void touchFigure() override;
 
         protected:
Index: /code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h	(revision 10817)
@@ -46,6 +46,6 @@
             JumpPlatformFake(Context* context);
             virtual ~JumpPlatformFake();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     };
 }
Index: /code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h	(revision 10817)
@@ -41,8 +41,8 @@
             JumpPlatformHMove(Context* context);
             virtual ~JumpPlatformHMove();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void setProperties(float leftBoundary, float rightBoundary, float speed);
-            virtual void touchFigure();
+            virtual void touchFigure() override;
 
         protected:
Index: /code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h	(revision 10817)
@@ -41,8 +41,8 @@
             virtual ~JumpPlatformStatic();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void touchFigure();
+            virtual void touchFigure() override;
     };
 }
Index: /code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h	(revision 10817)
@@ -46,9 +46,9 @@
             JumpPlatformTimer(Context* context);
             virtual ~JumpPlatformTimer();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void setProperties(float time);
             virtual bool isActive(void);
-            virtual void touchFigure();
+            virtual void touchFigure() override;
 
             void setEffectPath(const std::string& effectPath)
Index: /code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h	(revision 10817)
@@ -40,8 +40,8 @@
             JumpPlatformVMove(Context* context);
             virtual ~JumpPlatformVMove();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void setProperties(float leftBoundary, float rightBoundary, float speed);
-            virtual void touchFigure();
+            virtual void touchFigure() override;
 
         protected:
Index: /code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~JumpProjectile();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void setFieldDimension(float width, float height)
Index: /code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h	(revision 10817)
@@ -40,7 +40,7 @@
             JumpPropeller(Context* context);
             virtual ~JumpPropeller();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void touchFigure();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void touchFigure() override;
             virtual float getFuelState();
         protected:
Index: /code/branches/cpp11_v2/src/modules/jump/JumpRocket.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpRocket.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpRocket.h	(revision 10817)
@@ -40,7 +40,7 @@
             JumpRocket(Context* context);
             virtual ~JumpRocket();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void touchFigure();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void touchFigure() override;
             virtual float getFuelState();
         protected:
Index: /code/branches/cpp11_v2/src/modules/jump/JumpScore.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpScore.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpScore.h	(revision 10817)
@@ -44,7 +44,7 @@
             virtual ~JumpScore();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             void setShowScore(const bool showScore)
Index: /code/branches/cpp11_v2/src/modules/jump/JumpShield.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpShield.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpShield.h	(revision 10817)
@@ -40,7 +40,7 @@
             JumpShield(Context* context);
             virtual ~JumpShield();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void touchFigure();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void touchFigure() override;
             virtual float getFuelState();
         protected:
Index: /code/branches/cpp11_v2/src/modules/jump/JumpSpring.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/jump/JumpSpring.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/jump/JumpSpring.h	(revision 10817)
@@ -40,8 +40,8 @@
             JumpSpring(Context* context);
             virtual ~JumpSpring();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void accelerateFigure();
-            virtual void touchFigure();
+            virtual void touchFigure() override;
         protected:
             float stretch_;
Index: /code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h	(revision 10817)
@@ -65,8 +65,8 @@
             virtual ~Mini4Dgame(); //!< Destructor. Cleans up, if initialized.
 
-            virtual void start(void); //!< Starts the Mini4Dgame minigame.
-            virtual void end(void); ///!< Ends the Mini4Dgame minigame.
+            virtual void start(void) override; //!< Starts the Mini4Dgame minigame.
+            virtual void end(void) override; ///!< Ends the Mini4Dgame minigame.
 
-            virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
+            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
 
             void setGameboard(Mini4DgameBoard* board)
@@ -84,5 +84,5 @@
 
         protected:
-            virtual void spawnPlayersIfRequested(); //!< Spawns player.
+            virtual void spawnPlayersIfRequested() override; //!< Spawns player.
 
 
Index: /code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h	(revision 10817)
@@ -74,5 +74,5 @@
             //virtual ~Mini4DgameBoard();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             bool isValidMove(const Mini4DgamePosition& move);
Index: /code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.h	(revision 10817)
@@ -79,6 +79,6 @@
             virtual ~NotificationDispatcher(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a NotificationDispatcher object through XML.
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a NotificationDispatcher object through XML.
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             /**
Index: /code/branches/cpp11_v2/src/modules/notifications/NotificationManager.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/notifications/NotificationManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/notifications/NotificationManager.h	(revision 10817)
@@ -120,5 +120,5 @@
             virtual ~NotificationManager();
 
-            virtual void preDestroy(void); // Is called before the object is destroyed.
+            virtual void preDestroy(void) override; // Is called before the object is destroyed.
 
             /**
@@ -128,6 +128,6 @@
             static NotificationManager& getInstance() { return Singleton<NotificationManager>::getInstance(); } // tolua_export
 
-            virtual bool registerNotification(const std::string& message, const std::string& sender, notificationMessageType::Value type);
-            virtual bool executeCommand(notificationCommand::Value command, const std::string& sender);
+            virtual bool registerNotification(const std::string& message, const std::string& sender, notificationMessageType::Value type) override;
+            virtual bool executeCommand(notificationCommand::Value command, const std::string& sender) override;
 
             bool registerNotification(Notification* notification); // Registers a Notification within the NotificationManager.
Index: /code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.h	(revision 10817)
@@ -97,8 +97,8 @@
             virtual ~NotificationQueue();
 
-            virtual void tick(float dt); // To update from time to time.
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
-            virtual void changedName(void);
+            virtual void tick(float dt) override; // To update from time to time.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+
+            virtual void changedName(void) override;
             
             void update(void); // Updates the NotificationQueue.
Index: /code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.h	(revision 10817)
@@ -73,7 +73,7 @@
             virtual ~NotificationQueueCEGUI();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void changedName(void);
+            virtual void changedName(void) override;
 
             void destroy(bool noGraphics = false); // Destroys the NotificationQueue.
@@ -136,11 +136,11 @@
             void registerVariables();
             
-            virtual void create(void); // Creates the NotificationQueue in lua.
+            virtual void create(void) override; // Creates the NotificationQueue in lua.
             
-            virtual void notificationPushed(Notification* notification); // Is called by the NotificationQueue when a Notification was pushed
-            virtual void notificationPopped(void); // Is called by the NotificationQueue when a Notification was popped.
-            virtual void notificationRemoved(unsigned int index); // Is called when a Notification was removed.
+            virtual void notificationPushed(Notification* notification) override; // Is called by the NotificationQueue when a Notification was pushed
+            virtual void notificationPopped(void) override; // Is called by the NotificationQueue when a Notification was popped.
+            virtual void notificationRemoved(unsigned int index) override; // Is called when a Notification was removed.
             
-            virtual void clear(bool noGraphics = false); // Clears the NotificationQueue by removing all NotificationContainers.
+            virtual void clear(bool noGraphics = false) override; // Clears the NotificationQueue by removing all NotificationContainers.
 
         protected:
Index: /code/branches/cpp11_v2/src/modules/objects/Attacher.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/objects/Attacher.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/objects/Attacher.h	(revision 10817)
@@ -51,9 +51,9 @@
             virtual ~Attacher() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void processEvent(Event& event);
-            virtual void changedActivity();
-            virtual void changedVisibility();
+            virtual void processEvent(Event& event) override;
+            virtual void changedActivity() override;
+            virtual void changedVisibility() override;
 
             void addObject(WorldEntity* object);
@@ -64,5 +64,5 @@
                 { return this->targetname_; }
 
-            void loadedNewXMLName(BaseObject* object);
+            void loadedNewXMLName(BaseObject* object) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/objects/ForceField.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/objects/ForceField.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/objects/ForceField.h	(revision 10817)
@@ -92,7 +92,7 @@
             virtual ~ForceField();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a ForceField object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates a ForceField object through XML.
             void registerVariables(); //!< Registers the variables that should get synchronised over the network
-            virtual void tick(float dt); //!< A method that is called every tick.
+            virtual void tick(float dt) override; //!< A method that is called every tick.
             
 
Index: /code/branches/cpp11_v2/src/modules/objects/Planet.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/objects/Planet.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/objects/Planet.h	(revision 10817)
@@ -52,9 +52,9 @@
             virtual ~Planet();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
             inline void setMeshSource(const std::string& meshname)
Index: /code/branches/cpp11_v2/src/modules/objects/Script.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/objects/Script.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/objects/Script.h	(revision 10817)
@@ -98,6 +98,6 @@
             virtual ~Script();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Script object through XML.
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a port that can be used to channel events and react to them.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a Script object through XML.
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates a port that can be used to channel events and react to them.
 
             bool trigger(bool triggered, BaseObject* trigger); //!< Is called when an event comes in trough the event port.
@@ -168,6 +168,6 @@
                 { return this->forAll_; }
 
-            virtual void clientConnected(unsigned int clientId); //!< Callback that is called when a new client has connected.
-            virtual void clientDisconnected(unsigned int clientid) {}
+            virtual void clientConnected(unsigned int clientId) override; //!< Callback that is called when a new client has connected.
+            virtual void clientDisconnected(unsigned int clientid) override {}
 
         private:
Index: /code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h	(revision 10817)
@@ -93,7 +93,7 @@
             int getReaction();
 
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            void tick(float dt);
+            void tick(float dt) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/objects/Turret.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/objects/Turret.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/objects/Turret.h	(revision 10817)
@@ -61,12 +61,12 @@
             virtual ~Turret();
 
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
             virtual float isInRange(const WorldEntity* target);
             virtual void aimAtPosition(const Vector3 &position);
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
 
             /** @brief Sets the maximum distance the turret is allowed to shoot. @param radius The distance*/
Index: /code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h	(revision 10817)
@@ -44,6 +44,6 @@
             virtual ~FadeoutText() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
 
             inline void setDelay(float delay)
@@ -58,6 +58,6 @@
 
         private:
-            virtual void changedColour();
-            virtual void changedCaption();
+            virtual void changedColour() override;
+            virtual void changedCaption() override;
 
             void fadeout();
Index: /code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h	(revision 10817)
@@ -44,11 +44,11 @@
             virtual ~GUIOverlay();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void setGUIName(const std::string& name);
             inline const std::string& getGUIName() const { return this->guiName_; }
 
-            virtual void changedVisibility();
-            virtual void changedOwner();
+            virtual void changedVisibility() override;
+            virtual void changedOwner() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/overlays/OverlayText.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/OverlayText.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/OverlayText.h	(revision 10817)
@@ -52,5 +52,5 @@
         virtual ~OverlayText();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void setCaption(const std::string& caption);
@@ -76,5 +76,5 @@
 
     protected:
-        virtual void sizeChanged();
+        virtual void sizeChanged() override;
         virtual void changedColour() {}
         virtual void changedCaption() {}
Index: /code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h	(revision 10817)
@@ -43,5 +43,5 @@
         virtual ~DebugFPSText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }
Index: /code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h	(revision 10817)
@@ -43,5 +43,5 @@
         virtual ~DebugPositionText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }
Index: /code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h	(revision 10817)
@@ -43,5 +43,5 @@
         virtual ~DebugRTRText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~AnnounceMessage() {}
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void announcemessage(const GametypeInfo* gtinfo, const std::string& message);
+            void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h	(revision 10817)
@@ -49,5 +49,5 @@
 
         protected:
-            virtual void incomingChat(const std::string& message, const std::string& name);
+            virtual void incomingChat(const std::string& message, const std::string& name) override;
 
             std::list<Ogre::DisplayString> messages_;
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.h	(revision 10817)
@@ -44,7 +44,7 @@
             virtual ~CountDown();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
+            virtual void tick(float dt) override;
 
             inline void setCounter(float value)
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~DeathMessage() {}
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void deathmessage(const GametypeInfo* gtinfo, const std::string& message);
+            void deathmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~GametypeFadingMessage();
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void fadingmessage(const GametypeInfo* gtinfo, const std::string& message);
+            void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h	(revision 10817)
@@ -46,7 +46,7 @@
             virtual ~GametypeStaticMessage();
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour);
+            void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.h	(revision 10817)
@@ -51,5 +51,5 @@
         virtual ~BarColour() { }
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void setColour(const ColourValue& colour) { this->colour_ = colour; }
@@ -71,5 +71,5 @@
         virtual ~HUDBar();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void clearColours();
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h	(revision 10817)
@@ -43,6 +43,6 @@
         virtual ~HUDBoostBar();
 
-        virtual void tick(float dt);
-        virtual void changedOwner();
+        virtual void tick(float dt) override;
+        virtual void changedOwner() override;
 
     private:
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc	(revision 10817)
@@ -30,4 +30,5 @@
 
 #include "core/config/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
 #include "worldentities/pawns/Pawn.h"
 
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h	(revision 10817)
@@ -41,7 +41,7 @@
 
             void setConfigValues();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            void changedOwner();
+            void changedOwner() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.h	(revision 10817)
@@ -45,10 +45,10 @@
             virtual ~HUDHealthBar();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
-            virtual void changedOwner();
-            virtual void changedOverlayGroup();
-            virtual void changedVisibility();
-            virtual void changedName();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
+            virtual void changedOwner() override;
+            virtual void changedOverlayGroup() override;
+            virtual void changedVisibility() override;
+            virtual void changedName() override;
 
             inline void setTextFont(const std::string& font)
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h	(revision 10817)
@@ -51,19 +51,19 @@
             void setConfigValues();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
 
             // RadarListener interface
-            virtual void addObject(RadarViewable* object);
-            virtual void removeObject(RadarViewable* viewable);
-            virtual void objectChanged(RadarViewable* viewable);
+            virtual void addObject(RadarViewable* object) override;
+            virtual void removeObject(RadarViewable* viewable) override;
+            virtual void objectChanged(RadarViewable* viewable) override;
 
-            virtual void changedOwner();
-            virtual void sizeChanged();
-            virtual void angleChanged() { }
-            virtual void positionChanged() { }
-            virtual void radarTick(float dt) {}
+            virtual void changedOwner() override;
+            virtual void sizeChanged() override;
+            virtual void angleChanged() override { }
+            virtual void positionChanged() override { }
+            virtual void radarTick(float dt) override {}
 
-            inline float getRadarSensitivity() const
+            inline float getRadarSensitivity() const override
                 { return 1.0f; }
 
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h	(revision 10817)
@@ -50,6 +50,6 @@
         virtual ~HUDRadar();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-        virtual void changedOwner();
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+        virtual void changedOwner() override;
         void setConfigValues();
 
@@ -80,5 +80,5 @@
         void set3DMaterialBack(std::string material3DBack) { this->material3DBack_ = material3DBack; }
 
-        float getRadarSensitivity() const { return this->sensitivity_; }
+        float getRadarSensitivity() const override { return this->sensitivity_; }
         // used also by RadarListener interface!
         void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; }
@@ -89,8 +89,8 @@
 
         // RadarListener interface
-        virtual void addObject(RadarViewable* viewable);
-        virtual void removeObject(RadarViewable* viewable);
-        virtual void objectChanged( RadarViewable* rv );
-        void radarTick(float dt);
+        virtual void addObject(RadarViewable* viewable) override;
+        virtual void removeObject(RadarViewable* viewable) override;
+        virtual void objectChanged( RadarViewable* rv ) override;
+        void radarTick(float dt) override;
         bool showObject( RadarViewable* rv ); //!< Do not display an object on radar, if showObject(.) is false.
 
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.h	(revision 10817)
@@ -44,6 +44,6 @@
         virtual ~HUDSpeedBar();
 
-        virtual void tick(float dt);
-        virtual void changedOwner();
+        virtual void tick(float dt) override;
+        virtual void changedOwner() override;
 
     private:
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h	(revision 10817)
@@ -43,7 +43,7 @@
         virtual ~HUDTimer();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
 
-        virtual void changedOwner();
+        virtual void changedOwner() override;
 
     private:
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~KillMessage() {}
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void killmessage(const GametypeInfo* gtinfo, const std::string& message);
+            void killmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~LastManStandingInfos();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowLives(bool value)
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~LastTeamStandingInfos();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowLives(bool value)
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h	(revision 10817)
@@ -42,8 +42,8 @@
             PauseNotice(Context* context);
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
         protected:
-            virtual void changedTimeFactor(float factor_new, float factor_old);
+            virtual void changedTimeFactor(float factor_new, float factor_old) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~TeamBaseMatchScore();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowBases(bool value)
Index: /code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h	(revision 10817)
@@ -44,5 +44,5 @@
         virtual ~Scoreboard();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
 
         inline void setCreateLines(CreateLines* cl)
@@ -51,5 +51,5 @@
             { return this->createlines_; }
 
-        virtual void changedVisibility();
+        virtual void changedVisibility() override;
 
     private: // functions
Index: /code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h	(revision 10817)
@@ -46,5 +46,5 @@
         void setConfigValues();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
 
     private: // variables
Index: /code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h	(revision 10817)
@@ -61,6 +61,6 @@
             virtual ~CollectiblePickup(); //! Destructor.
 
-            virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
+            virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
+            virtual void changedPickedUp(void) override; //!< Is called when the pickup has transited from picked up to dropped or the other way around.
 
             /**
Index: /code/branches/cpp11_v2/src/modules/pickup/Pickup.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pickup/Pickup.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pickup/Pickup.h	(revision 10817)
@@ -103,7 +103,7 @@
             virtual ~Pickup(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual const std::string& getRepresentationName() const
+            virtual const std::string& getRepresentationName() const override
                 { return this->representationName_; }
 
@@ -149,8 +149,8 @@
                 { return this->getDurationType() == pickupDurationType::continuous; }
 
-            virtual void changedPickedUp(void); //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
+            virtual void changedPickedUp(void) override; //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
 
         protected:
-            virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
+            virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
 
             /**
Index: /code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h	(revision 10817)
@@ -73,15 +73,15 @@
             virtual ~PickupCollection(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates an instance of this Class through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates an instance of this Class through XML.
 
-            virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            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 changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
+            virtual void changedCarrier(void) override; //!< Is called when the pickup has changed its PickupCarrier.
+            virtual void changedPickedUp(void) override; //!< Is called when the pickup has transited from picked up to dropped or the other way around.
 
-            virtual bool isTarget(const PickupCarrier* carrier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
+            virtual bool isTarget(const PickupCarrier* carrier) const override; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
 
             inline void setRepresentationName(const std::string& name)
                 { this->representationName_ = name; }
-            virtual const std::string& getRepresentationName() const
+            virtual const std::string& getRepresentationName() const override
                 { return this->representationName_; }
 
@@ -98,5 +98,5 @@
 
         protected:
-            virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
+            virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
 
         private:
Index: /code/branches/cpp11_v2/src/modules/pickup/PickupManager.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pickup/PickupManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pickup/PickupManager.h	(revision 10817)
@@ -117,7 +117,7 @@
             PickupRepresentation* getRepresentation(const std::string& name); // tolua_export
 
-            virtual void pickupChangedUsed(Pickupable* pickup, bool used); //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input used state.
+            virtual void pickupChangedUsed(Pickupable* pickup, bool used) override; //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input used state.
             static void pickupChangedUsedNetwork(uint32_t pickup, bool inUse, bool usable, bool unusable); //!< Helper method to react to the change in the used status of a Pickupable.
-            virtual void pickupChangedPickedUp(Pickupable* pickup, bool pickedUp); //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input pickedUp state.
+            virtual void pickupChangedPickedUp(Pickupable* pickup, bool pickedUp) override; //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input pickedUp state.
             static void pickupChangedPickedUpNetwork(uint32_t pickup, bool usable, uint32_t representationObjectId, const std::string& representationName, bool pickedUp); //!< Helper method to react to the change in the pickedUp status of a Pickupable.
 
Index: /code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h	(revision 10817)
@@ -98,5 +98,5 @@
             virtual ~PickupRepresentation(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PickupRepresentation object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a PickupRepresentation object through XML.
 
             /**
@@ -129,5 +129,5 @@
             inline const std::string& getInventoryRepresentation(void) const { return this->inventoryRepresentation_; } // tolua_export
 
-            virtual void changedName();
+            virtual void changedName() override;
 
             StaticEntity* createSpawnerRepresentation(PickupSpawner* spawner); //!< Create a spawnerRepresentation for a specific PickupSpawner.
Index: /code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h	(revision 10817)
@@ -82,6 +82,6 @@
             static PickupSpawner* createDroppedPickup(Context* context, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance = 10.0);
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);  //!< Method for creating a PickupSpawner through XML.
-            virtual void tick(float dt); //!< Tick, checks if any Pawn is close enough to trigger.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;  //!< Method for creating a PickupSpawner through XML.
+            virtual void tick(float dt) override; //!< Tick, checks if any Pawn is close enough to trigger.
 
             /**
Index: /code/branches/cpp11_v2/src/modules/pong/Pong.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pong/Pong.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pong/Pong.h	(revision 10817)
@@ -68,10 +68,10 @@
             virtual ~Pong(); //!< Destructor. Cleans up, if initialized.
 
-            virtual void start(); //!< Starts the Pong minigame.
-            virtual void end(); ///!< Ends the Pong minigame.
+            virtual void start() override; //!< Starts the Pong minigame.
+            virtual void end() override; ///!< Ends the Pong minigame.
 
-            virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
+            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
 
-            virtual void playerScored(PlayerInfo* player, int score = 1); //!< Is called when the player scored.
+            virtual void playerScored(PlayerInfo* player, int score = 1) override; //!< Is called when the player scored.
 
             /**
@@ -87,5 +87,5 @@
 
         protected:
-            virtual void spawnPlayersIfRequested(); //!< Spawns players, and fills the rest up with bots.
+            virtual void spawnPlayersIfRequested() override; //!< Spawns players, and fills the rest up with bots.
 
             void startBall(); //!< Starts the ball with some default speed.
Index: /code/branches/cpp11_v2/src/modules/pong/PongAI.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pong/PongAI.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pong/PongAI.h	(revision 10817)
@@ -66,5 +66,5 @@
             void setConfigValues();
 
-            virtual void tick(float dt); //!< Implements the behavior of the PongAI (i.e. its intelligence).
+            virtual void tick(float dt) override; //!< Implements the behavior of the PongAI (i.e. its intelligence).
 
             /**
Index: /code/branches/cpp11_v2/src/modules/pong/PongBall.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pong/PongBall.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pong/PongBall.h	(revision 10817)
@@ -63,7 +63,7 @@
             virtual ~PongBall();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             /**
Index: /code/branches/cpp11_v2/src/modules/pong/PongBat.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pong/PongBat.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pong/PongBat.h	(revision 10817)
@@ -60,10 +60,10 @@
             virtual ~PongBat() {}
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
+            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
 
-            virtual void changedPlayer(); //!< Is called when the player changed.
+            virtual void changedPlayer() override; //!< Is called when the player changed.
 
             /**
Index: /code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.h	(revision 10817)
@@ -124,5 +124,5 @@
             virtual ~PongCenterpoint() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a PongCenterpoint through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a PongCenterpoint through XML.
 
             /**
Index: /code/branches/cpp11_v2/src/modules/pong/PongScore.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/pong/PongScore.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/pong/PongScore.h	(revision 10817)
@@ -60,7 +60,7 @@
             virtual ~PongScore();
 
-            virtual void tick(float dt); //!< Creates and sets the caption to be displayed by the PongScore.
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner(); //!< Is called when the owner changes.
+            virtual void tick(float dt) override; //!< Creates and sets the caption to be displayed by the PongScore.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override; //!< Is called when the owner changes.
 
             /**
Index: /code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h	(revision 10817)
@@ -63,11 +63,11 @@
             virtual ~PortalEndPoint();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedActivity(void);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedActivity(void) override;
 
             inline void setTarget(const std::string & target)                 //!< add types which are allowed to activate the PortalEndPoint
                 { this->trigger_->addTarget(target); }
 
-            void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
             static std::map<unsigned int, PortalEndPoint *> idMap_s; //!< Maps the id of each PortalEndPoint to a pointer to that PortalEndPoint
             inline void setReenterDelay(unsigned int seconds)
Index: /code/branches/cpp11_v2/src/modules/portals/PortalLink.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/portals/PortalLink.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/portals/PortalLink.h	(revision 10817)
@@ -56,5 +56,5 @@
             PortalLink(Context* context);
             virtual ~PortalLink();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline void setFromID(unsigned int from)    //!< set the ID of the PortalEndPoint which should act as the entrance of this link
Index: /code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h	(revision 10817)
@@ -93,17 +93,17 @@
             virtual ~GlobalQuest();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a GlobalQuest object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a GlobalQuest object through XML.
 
-            virtual bool fail(PlayerInfo* player); //!< Fails the Quest.
-            virtual bool complete(PlayerInfo* player); //!< Completes the Quest.
+            virtual bool fail(PlayerInfo* player) override; //!< Fails the Quest.
+            virtual bool complete(PlayerInfo* player) override; //!< Completes the Quest.
 
         protected:
-            virtual bool isStartable(const PlayerInfo* player) const; //!< Checks whether the Quest can be started.
-            virtual bool isFailable(const PlayerInfo* player) const; //!< Checks whether the Quest can be failed.
-            virtual bool isCompletable(const PlayerInfo* player) const; //!< Checks whether the Quest can be completed.
+            virtual bool isStartable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be started.
+            virtual bool isFailable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be failed.
+            virtual bool isCompletable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be completed.
 
-            virtual QuestStatus::Value getStatus(const PlayerInfo* player) const; //!< Returns the status of the Quest for a specific player.
+            virtual QuestStatus::Value getStatus(const PlayerInfo* player) const override; //!< Returns the status of the Quest for a specific player.
 
-            virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status); //!< Sets the status for a specific player.
+            virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status) override; //!< Sets the status for a specific player.
 
         private:
Index: /code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h	(revision 10817)
@@ -87,16 +87,16 @@
             virtual ~LocalQuest();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a LocalQuest object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a LocalQuest object through XML.
 
-            virtual bool fail(PlayerInfo* player); //!< Fails the Quest.
-            virtual bool complete(PlayerInfo* player); //!< Completes the Quest.
+            virtual bool fail(PlayerInfo* player) override; //!< Fails the Quest.
+            virtual bool complete(PlayerInfo* player) override; //!< Completes the Quest.
 
         protected:
-            virtual bool isStartable(const PlayerInfo* player) const; //!< Checks whether the Quest can be started.
-            virtual bool isFailable(const PlayerInfo* player) const; //!< Checks whether the Quest can be failed.
-            virtual bool isCompletable(const PlayerInfo* player) const; //!< Checks whether the Quest can be completed.
+            virtual bool isStartable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be started.
+            virtual bool isFailable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be failed.
+            virtual bool isCompletable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be completed.
 
-            virtual QuestStatus::Value getStatus(const PlayerInfo* player) const; //!< Returns the status of the Quest for a specific player.
-            virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status); //!< Sets the status for a specific player.
+            virtual QuestStatus::Value getStatus(const PlayerInfo* player) const override; //!< Returns the status of the Quest for a specific player.
+            virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status) override; //!< Sets the status for a specific player.
 
         private:
Index: /code/branches/cpp11_v2/src/modules/questsystem/Quest.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/Quest.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/Quest.h	(revision 10817)
@@ -85,5 +85,5 @@
             virtual ~Quest();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Quest object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a Quest object through XML.
 
             /**
Index: /code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.h	(revision 10817)
@@ -67,5 +67,5 @@
             virtual ~QuestDescription();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestDescription object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestDescription object through XML.
 
 // tolua_begin
Index: /code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h	(revision 10817)
@@ -96,6 +96,6 @@
             virtual ~QuestEffectBeacon();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestEffectBeacon object through XML.
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestEffectBeacon object through XML.
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             bool execute(bool bTriggered, BaseObject* trigger); //!< Executes the QuestEffects of the QuestEffectBeacon.
Index: /code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h	(revision 10817)
@@ -85,5 +85,5 @@
             virtual ~QuestHint();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestHint object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestHint object through XML.
 
             bool isActive(const PlayerInfo* player) const; //!< Returns true if the QuestHint is active for the input player.
Index: /code/branches/cpp11_v2/src/modules/questsystem/QuestItem.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/QuestItem.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/QuestItem.h	(revision 10817)
@@ -63,5 +63,5 @@
             virtual ~QuestItem();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestItem object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestItem object through XML.
 
             /**
Index: /code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h	(revision 10817)
@@ -90,5 +90,5 @@
             virtual ~QuestListener();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestListener object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestListener object through XML.
 
             static void advertiseStatusChange(std::list<QuestListener*> & listeners, const std::string & status); //!< Makes all QuestListener in the list aware that a certain status change has occured.
Index: /code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.h	(revision 10817)
@@ -62,7 +62,7 @@
         virtual ~AddQuest();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddQuest object through XML.
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddQuest object through XML.
 
-        virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+        virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
 
     };
Index: /code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.h	(revision 10817)
@@ -64,7 +64,7 @@
             virtual ~AddQuestHint();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddQuestHint object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddQuestHint object through XML.
 
-            virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
 
         private:
Index: /code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.h	(revision 10817)
@@ -68,7 +68,7 @@
             virtual ~AddReward();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddReward object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddReward object through XML.
 
-            virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
 
         private:
Index: /code/branches/cpp11_v2/src/modules/questsystem/effects/ChangeQuestStatus.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/effects/ChangeQuestStatus.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/effects/ChangeQuestStatus.h	(revision 10817)
@@ -59,5 +59,5 @@
             virtual ~ChangeQuestStatus();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a ChangeQuestStatus object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a ChangeQuestStatus object through XML.
 
             virtual bool invoke(PlayerInfo* player) = 0; //!< Invokes the QuestEffect.
Index: /code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.h	(revision 10817)
@@ -62,7 +62,7 @@
             virtual ~CompleteQuest();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a CompleteQuest object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a CompleteQuest object through XML.
 
-            virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
 
     };
Index: /code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.h	(revision 10817)
@@ -62,7 +62,7 @@
             virtual ~FailQuest();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a FailQuest object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a FailQuest object through XML.
 
-            virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
 
     };
Index: /code/branches/cpp11_v2/src/modules/tetris/Tetris.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/tetris/Tetris.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/tetris/Tetris.h	(revision 10817)
@@ -58,11 +58,11 @@
             virtual ~Tetris(); //!< Destructor. Cleans up, if initialized.
 
-            virtual void start(void); //!< Starts the Tetris minigame.
-            virtual void end(void); ///!< Ends the Tetris minigame.
+            virtual void start(void) override; //!< Starts the Tetris minigame.
+            virtual void end(void) override; ///!< Ends the Tetris minigame.
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
-            virtual bool playerLeft(PlayerInfo* player);
+            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
+            virtual bool playerLeft(PlayerInfo* player) override;
 
             void setCenterpoint(TetrisCenterpoint* center);
@@ -77,5 +77,5 @@
 
         protected:
-            virtual void spawnPlayersIfRequested(); //!< Spawns player.
+            virtual void spawnPlayersIfRequested() override; //!< Spawns player.
 
 
Index: /code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.h	(revision 10817)
@@ -57,7 +57,7 @@
             virtual ~TetrisBrick() {}
 
-            virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void changedPlayer(); //!< Is called when the player changed.
+            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void changedPlayer() override; //!< Is called when the player changed.
 
             bool isValidMove(const Vector3& position, bool isRotation);
Index: /code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.h	(revision 10817)
@@ -62,5 +62,5 @@
             virtual ~TetrisCenterpoint() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a TetrisCenterpoint through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a TetrisCenterpoint through XML.
 
             /**
Index: /code/branches/cpp11_v2/src/modules/tetris/TetrisScore.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/tetris/TetrisScore.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/tetris/TetrisScore.h	(revision 10817)
@@ -60,7 +60,7 @@
             virtual ~TetrisScore();
 
-            virtual void tick(float dt); //!< Creates and sets the caption to be displayed by the TetrisScore.
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner(); //!< Is called when the owner changes.
+            virtual void tick(float dt) override; //!< Creates and sets the caption to be displayed by the TetrisScore.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override; //!< Is called when the owner changes.
 
         private:
Index: /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h	(revision 10817)
@@ -53,8 +53,8 @@
         virtual ~TowerDefense();        
         void addTowerDefenseEnemy(int templatenr);
-        virtual void start(); //<! The function is called when the gametype starts
-        virtual void end();
-        virtual void tick(float dt);
-        virtual void spawnPlayer(PlayerInfo* player);
+        virtual void start() override; //<! The function is called when the gametype starts
+        virtual void end() override;
+        virtual void tick(float dt) override;
+        virtual void spawnPlayer(PlayerInfo* player) override;
         PlayerInfo* getPlayer(void) const;
         int getCredit(){ return this->credit_; }
Index: /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.h	(revision 10817)
@@ -52,5 +52,5 @@
             virtual ~TowerDefenseCenterpoint() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             /**
Index: /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h	(revision 10817)
@@ -37,5 +37,5 @@
         //health gibt es unter: health_
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
         virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
 
Index: /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h	(revision 10817)
@@ -62,5 +62,5 @@
             TowerDefenseField(Context* context);
             virtual ~TowerDefenseField() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             const bool isFree() const
                 { return type_==FREE; }
Index: /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.h	(revision 10817)
@@ -53,7 +53,7 @@
 
 
-        virtual void tick(float dt);
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-        virtual void changedOwner();
+        virtual void tick(float dt) override;
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+        virtual void changedOwner() override;
         void setShowlives(bool temp)
             { this->showlives = temp; }
Index: /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseSelecter.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseSelecter.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseSelecter.h	(revision 10817)
@@ -41,14 +41,14 @@
             TowerDefenseSelecter(Context* context); //!< Constructor. Registers and initializes the object.
             virtual ~TowerDefenseSelecter();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);         
-            virtual void tick(float dt);            
-            virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;         
+            virtual void tick(float dt) override;            
+            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
             void fire(unsigned int firemode);
-            virtual void fired(unsigned int firemode);
-            virtual void boost(bool bBoost);
+            virtual void fired(unsigned int firemode) override;
+            virtual void boost(bool bBoost) override;
             virtual void setSelectedPosition(TDCoordinate* newPos);
             virtual void setSelectedPosition(int x, int y);
Index: /code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.h	(revision 10817)
@@ -55,5 +55,5 @@
             IceGunFreezer(Context* context);
             virtual ~IceGunFreezer();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
             virtual void startFreezing();
             virtual void stopFreezing();
Index: /code/branches/cpp11_v2/src/modules/weapons/RocketController.cc
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/RocketController.cc	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/RocketController.cc	(revision 10817)
@@ -38,4 +38,5 @@
 #include "projectiles/SimpleRocket.h"
 #include "weaponmodes/SimpleRocketFire.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox
Index: /code/branches/cpp11_v2/src/modules/weapons/RocketController.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/RocketController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/RocketController.h	(revision 10817)
@@ -55,5 +55,5 @@
             virtual ~RocketController();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
             /**
             @brief Get the rocket that is controlled by this controller.
Index: /code/branches/cpp11_v2/src/modules/weapons/projectiles/BillboardProjectile.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/projectiles/BillboardProjectile.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/projectiles/BillboardProjectile.h	(revision 10817)
@@ -61,5 +61,5 @@
             virtual void setMaterial(const std::string& material);
             virtual const std::string& getMaterial();
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.h	(revision 10817)
@@ -41,7 +41,7 @@
             GravityBomb(Context* context);
             virtual ~GravityBomb();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
             void detonate();
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.h	(revision 10817)
@@ -39,5 +39,5 @@
     GravityBombField(Context* context);
     virtual ~GravityBombField();
-    virtual void tick(float dt);
+    virtual void tick(float dt) override;
     virtual void destroy();
 
Index: /code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.h	(revision 10817)
@@ -62,5 +62,5 @@
 
         protected:
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
         private:         
             float freezeTime_; //The duration of the freezing effect on a target
Index: /code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.h	(revision 10817)
@@ -58,5 +58,5 @@
             virtual ~LightningGunProjectile() {}
 
-            virtual void setMaterial(const std::string& material);
+            virtual void setMaterial(const std::string& material) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.h	(revision 10817)
@@ -53,5 +53,5 @@
             ParticleProjectile(Context* context);
             virtual ~ParticleProjectile();
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.h	(revision 10817)
@@ -64,6 +64,6 @@
             void setConfigValues();
 
-            virtual void tick(float dt);
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual void tick(float dt) override;
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
 
         protected:
Index: /code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.h	(revision 10817)
@@ -62,17 +62,17 @@
             virtual ~Rocket();
 
-            virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
+            virtual void tick(float dt) override; //!< Defines which actions the Rocket has to take in each tick.
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
-            virtual void destroyObject(void);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
+            virtual void destroyObject(void) override;
             void destructionEffect();
 
-            virtual void moveFrontBack(const Vector2& value) {}
-            virtual void moveRightLeft(const Vector2& value) {}
-            virtual void moveUpDown(const Vector2& value) {}
+            virtual void moveFrontBack(const Vector2& value) override {}
+            virtual void moveRightLeft(const Vector2& value) override {}
+            virtual void moveUpDown(const Vector2& value) override {}
 
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
 
             /**
@@ -114,7 +114,7 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            virtual void setShooter(Pawn* shooter);
+            virtual void setShooter(Pawn* shooter) override;
 
-            virtual void fired(unsigned int firemode);
+            virtual void fired(unsigned int firemode) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.h	(revision 10817)
@@ -62,17 +62,17 @@
             virtual ~RocketOld();
 
-            virtual void tick(float dt); //!< Defines which actions the RocketOld has to take in each tick.
+            virtual void tick(float dt) override; //!< Defines which actions the RocketOld has to take in each tick.
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
-            virtual void destroyObject(void);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
+            virtual void destroyObject(void) override;
             void destructionEffect();
 
-            virtual void moveFrontBack(const Vector2& value) {}
-            virtual void moveRightLeft(const Vector2& value) {}
-            virtual void moveUpDown(const Vector2& value) {}
+            virtual void moveFrontBack(const Vector2& value) override {}
+            virtual void moveRightLeft(const Vector2& value) override {}
+            virtual void moveUpDown(const Vector2& value) override {}
 
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
 
             /**
@@ -114,7 +114,7 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            virtual void setShooter(Pawn* shooter);
+            virtual void setShooter(Pawn* shooter) override;
 
-            virtual void fired(unsigned int firemode);
+            virtual void fired(unsigned int firemode) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.h	(revision 10817)
@@ -62,17 +62,17 @@
             SimpleRocket(Context* context);
             virtual ~SimpleRocket();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
 
             void disableFire(); //!< Method to disable the fire and stop all acceleration
 
-            virtual void moveFrontBack(const Vector2& value){}
-            virtual void moveRightLeft(const Vector2& value){}
-            virtual void moveUpDown(const Vector2& value){}
+            virtual void moveFrontBack(const Vector2& value) override{}
+            virtual void moveRightLeft(const Vector2& value) override{}
+            virtual void moveUpDown(const Vector2& value) override{}
 
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
             void setDestroy();
 
@@ -115,5 +115,5 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            virtual void setShooter(Pawn* shooter);
+            virtual void setShooter(Pawn* shooter) override;
 
             inline bool hasFuel() const
Index: /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/EnergyDrink.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/EnergyDrink.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/EnergyDrink.h	(revision 10817)
@@ -57,6 +57,6 @@
             virtual ~EnergyDrink() {}
 
-            virtual void fire();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void fire() override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/FusionFire.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/FusionFire.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/FusionFire.h	(revision 10817)
@@ -54,5 +54,5 @@
             virtual ~FusionFire() {}
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/GravityBombFire.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/GravityBombFire.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/GravityBombFire.h	(revision 10817)
@@ -34,5 +34,5 @@
             virtual ~GravityBombFire();
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/HsW01.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/HsW01.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/HsW01.h	(revision 10817)
@@ -56,6 +56,6 @@
             virtual ~HsW01();
 
-            virtual void fire();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void fire() override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         protected:
Index: /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/IceGun.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/IceGun.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/IceGun.h	(revision 10817)
@@ -54,6 +54,6 @@
             virtual ~IceGun();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void fire();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void fire() override;
             
             inline void setFreezeTime(float freezeTime)
Index: /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LaserFire.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LaserFire.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LaserFire.h	(revision 10817)
@@ -54,5 +54,5 @@
             virtual ~LaserFire() {}
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LightningGun.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LightningGun.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LightningGun.h	(revision 10817)
@@ -54,5 +54,5 @@
             virtual ~LightningGun();
 
-            virtual void fire();
+            virtual void fire() override;
 
        private:
Index: /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFire.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFire.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFire.h	(revision 10817)
@@ -54,5 +54,5 @@
             virtual ~RocketFire();
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFireOld.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFireOld.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFireOld.h	(revision 10817)
@@ -54,5 +54,5 @@
             virtual ~RocketFireOld();
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SimpleRocketFire.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SimpleRocketFire.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SimpleRocketFire.h	(revision 10817)
@@ -53,5 +53,5 @@
             virtual ~SimpleRocketFire();
             void deactivateFire();
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SplitGun.h
===================================================================
--- /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SplitGun.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SplitGun.h	(revision 10817)
@@ -54,6 +54,6 @@
             virtual ~SplitGun();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void fire();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void fire() override;
 
             inline void setNumberOfSplits(int numberOfSplits)
Index: /code/branches/cpp11_v2/src/orxonox/Level.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/Level.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/Level.h	(revision 10817)
@@ -47,5 +47,5 @@
             virtual ~Level();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void playerEntered(PlayerInfo* player);
Index: /code/branches/cpp11_v2/src/orxonox/LevelInfo.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/LevelInfo.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/LevelInfo.h	(revision 10817)
@@ -207,5 +207,5 @@
             virtual ~LevelInfo();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a LevelInfo object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates a LevelInfo object through XML.
 
             /**
Index: /code/branches/cpp11_v2/src/orxonox/PlayerManager.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/PlayerManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/PlayerManager.h	(revision 10817)
@@ -50,6 +50,6 @@
                 { return this->clients_; }
 
-            void clientConnected(unsigned int clientID);
-            void clientDisconnected(unsigned int clientID);
+            void clientConnected(unsigned int clientID) override;
+            void clientDisconnected(unsigned int clientID) override;
             void disconnectAllClients();
 
Index: /code/branches/cpp11_v2/src/orxonox/Radar.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/Radar.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/Radar.h	(revision 10817)
@@ -54,5 +54,5 @@
         virtual ~Radar();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
 
         const RadarViewable* getFocus();
Index: /code/branches/cpp11_v2/src/orxonox/Scene.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/Scene.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/Scene.h	(revision 10817)
@@ -51,5 +51,5 @@
             virtual ~Scene();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             void registerVariables();
 
@@ -79,7 +79,7 @@
                 { return this->radar_; }
 
-            inline virtual uint32_t getSceneID() const { return this->getObjectID(); }
+            inline virtual uint32_t getSceneID() const override { return this->getObjectID(); }
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
         private:
Index: /code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.h	(revision 10817)
@@ -82,5 +82,5 @@
        * \param senderID Identification number of the sender
        */
-      virtual void incomingChat(const std::string& message, const std::string& name);
+      virtual void incomingChat(const std::string& message, const std::string& name) override;
 
       /** Synchronize logfile onto the hard drive
Index: /code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h	(revision 10817)
@@ -125,5 +125,5 @@
        * history window of the full chat window)
        */
-      void incomingChat(const std::string& message, const std::string& name);
+      void incomingChat(const std::string& message, const std::string& name) override;
 
       /** \param full true means show full chat window with history,
Index: /code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h	(revision 10817)
@@ -55,5 +55,5 @@
             ChatManager(const ChatManager&);
 
-            virtual void incomingChat(const std::string& message, unsigned int sourceID);
+            virtual void incomingChat(const std::string& message, unsigned int sourceID) override;
 
             static ChatManager* singletonPtr_s;
Index: /code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.h	(revision 10817)
@@ -61,5 +61,5 @@
             virtual ~CollisionShape();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             /**
Index: /code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h	(revision 10817)
@@ -61,5 +61,5 @@
             virtual ~CompoundCollisionShape();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void attach(CollisionShape* shape);
@@ -70,9 +70,9 @@
             void updateAttachedShape(CollisionShape* shape);
 
-            virtual void changedScale();
+            virtual void changedScale() override;
 
         private:
             void updatePublicShape();
-            inline virtual btCollisionShape* createNewShape() const
+            inline virtual btCollisionShape* createNewShape() const override
                 { assert(false); return nullptr; }
 
Index: /code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h	(revision 10817)
@@ -46,8 +46,8 @@
 
         protected:
-            virtual void updateParent();
+            virtual void updateParent() override;
 
         private:
-            void parentChanged();
+            void parentChanged() override;
 
             WorldEntity* worldEntityOwner_;
Index: /code/branches/cpp11_v2/src/orxonox/controllers/AIController.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/controllers/AIController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/controllers/AIController.h	(revision 10817)
@@ -44,5 +44,5 @@
             virtual ~AIController();
 
-            virtual void tick(float dt); //<! Carrying out the targets set in action().
+            virtual void tick(float dt) override; //<! Carrying out the targets set in action().
 
         protected:
Index: /code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h	(revision 10817)
@@ -42,9 +42,9 @@
             virtual ~ArtificialController();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void abandonTarget(Pawn* target);
 
-            virtual void changedControllableEntity();
+            virtual void changedControllableEntity() override;
 
             virtual void doFire();
Index: /code/branches/cpp11_v2/src/orxonox/controllers/Controller.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/controllers/Controller.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/controllers/Controller.h	(revision 10817)
@@ -45,5 +45,5 @@
             Controller(Context* context);
             virtual ~Controller();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             inline void setPlayer(PlayerInfo* player)
                 { this->player_ = player; }
Index: /code/branches/cpp11_v2/src/orxonox/controllers/ControllerDirector.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/controllers/ControllerDirector.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/controllers/ControllerDirector.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~ControllerDirector() { }
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             bool party(bool bTriggered, BaseObject* trigger);
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline void setScriptName(const std::string& name) { this->scriptname_ = name; }
Index: /code/branches/cpp11_v2/src/orxonox/controllers/DroneController.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/controllers/DroneController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/controllers/DroneController.h	(revision 10817)
@@ -53,5 +53,5 @@
             virtual ~DroneController();
 
-            virtual void tick(float dt); //!< The controlling happens here. This method defines what the controller has to do each tick.
+            virtual void tick(float dt) override; //!< The controlling happens here. This method defines what the controller has to do each tick.
 
             void setOwner(Pawn* owner);
Index: /code/branches/cpp11_v2/src/orxonox/controllers/FormationController.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/controllers/FormationController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/controllers/FormationController.h	(revision 10817)
@@ -50,5 +50,5 @@
       virtual ~FormationController();
 
-      virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+      virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
 
@@ -93,5 +93,5 @@
            { return this->formationMode_; }
 
-      virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
+      virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) override;
 
       FormationController* getMaster( void ) { return myMaster_; }
@@ -99,5 +99,5 @@
       FormationController* getSlave( void ) { return this->slaves_.back(); }
 
-      virtual void changedControllableEntity();
+      virtual void changedControllableEntity() override;
 
   protected:
Index: /code/branches/cpp11_v2/src/orxonox/controllers/HumanController.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/controllers/HumanController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/controllers/HumanController.h	(revision 10817)
@@ -47,5 +47,5 @@
             virtual ~HumanController();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             static void moveFrontBack(const Vector2& value);
Index: /code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.h	(revision 10817)
@@ -45,16 +45,16 @@
             virtual ~NewHumanController();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void frontback(const Vector2& value);
-            virtual void yaw(const Vector2& value);
-            virtual void pitch(const Vector2& value);
+            virtual void frontback(const Vector2& value) override;
+            virtual void yaw(const Vector2& value) override;
+            virtual void pitch(const Vector2& value) override;
 
             static void accelerate();
             static void decelerate();
 
-            virtual void doFire(unsigned int firemode);
+            virtual void doFire(unsigned int firemode) override;
 
-            virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
+            virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) override;
 
             static void unfire();
@@ -65,7 +65,7 @@
             static void changeMode();
 
-            virtual void changedControllableEntity();
-            virtual void doPauseControl();
-            virtual void doResumeControl();
+            virtual void changedControllableEntity() override;
+            virtual void doPauseControl() override;
+            virtual void doResumeControl() override;
 
             float getCurrentYaw(){ return this->currentYaw_; }
Index: /code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.h	(revision 10817)
@@ -71,5 +71,5 @@
             void setPlayer(PlayerInfo* player) { this->player_ = player; }
            
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             // LUA interface
Index: /code/branches/cpp11_v2/src/orxonox/controllers/WaypointController.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/controllers/WaypointController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/controllers/WaypointController.h	(revision 10817)
@@ -44,5 +44,5 @@
             virtual ~WaypointController();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
         protected:
Index: /code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.h	(revision 10817)
@@ -43,6 +43,6 @@
             virtual ~WaypointPatrolController() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
 
             inline void setAlertnessRadius(float radius)
Index: /code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h	(revision 10817)
@@ -43,7 +43,7 @@
         ~GSClient();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
     };
 }
Index: /code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h	(revision 10817)
@@ -53,7 +53,7 @@
         ~GSGraphics();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
     private:
Index: /code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h	(revision 10817)
@@ -44,7 +44,7 @@
         ~GSLevel();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
         static void startMainMenu(void); //!< Starts the MainMenu
Index: /code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h	(revision 10817)
@@ -44,7 +44,7 @@
         ~GSMainMenu();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
         void setConfigValues();
Index: /code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h	(revision 10817)
@@ -45,7 +45,7 @@
       ~GSMasterServer();
 
-      void activate();
-      void deactivate();
-      void update(const Clock& time);
+      void activate() override;
+      void deactivate() override;
+      void update(const Clock& time) override;
 
     private:
Index: /code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h	(revision 10817)
@@ -44,7 +44,7 @@
         static void printObjects();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
         // this has to be public because proteced triggers a bug in msvc
@@ -59,5 +59,5 @@
 
     protected:
-        virtual void changedTimeFactor(float factor_new, float factor_old);
+        virtual void changedTimeFactor(float factor_new, float factor_old) override;
 
     private:
Index: /code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h	(revision 10817)
@@ -43,7 +43,7 @@
         ~GSServer();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
     private:
Index: /code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h	(revision 10817)
@@ -41,7 +41,7 @@
         ~GSStandalone();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
     private:
Index: /code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h	(revision 10817)
@@ -41,8 +41,8 @@
             virtual ~Asteroids() {}
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void start();
-            virtual void end();
+            virtual void start() override;
+            virtual void end() override;
 
             inline void firstCheckpointReached(bool reached)
@@ -50,5 +50,5 @@
 
         protected:
-            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
+            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
 
         private:
Index: /code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h	(revision 10817)
@@ -41,12 +41,12 @@
             virtual ~Deathmatch() {}
 
-            virtual void start();
-            virtual void end();
-            virtual void playerEntered(PlayerInfo* player);
-            virtual bool playerLeft(PlayerInfo* player);
-            virtual bool playerChangedName(PlayerInfo* player);
+            virtual void start() override;
+            virtual void end() override;
+            virtual void playerEntered(PlayerInfo* player) override;
+            virtual bool playerLeft(PlayerInfo* player) override;
+            virtual bool playerChangedName(PlayerInfo* player) override;
 
-            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
-            virtual void playerScored(PlayerInfo* player, int score = 1);
+            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
+            virtual void playerScored(PlayerInfo* player, int score = 1) override;
     };
 }
Index: /code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h	(revision 10817)
@@ -64,12 +64,12 @@
             bool tutorial; //goal: new players receive messages how the new gametype works - later it can be switched off.
 
-            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //ok - score function and management of parties
-            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //ok - simple
-            virtual void start();
-            virtual void end(); //Wie geht das mit der Punkteausgabe aendern? Z.B: Persoenliche Nachricht?
-            virtual void playerEntered(PlayerInfo* player);
-            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);//is used to initialize the player's party and colour
-            virtual bool playerLeft(PlayerInfo* player);
-            virtual bool playerChangedName(PlayerInfo* player);//unchanged
+            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; //ok - score function and management of parties
+            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override; //ok - simple
+            virtual void start() override;
+            virtual void end() override; //Wie geht das mit der Punkteausgabe aendern? Z.B: Persoenliche Nachricht?
+            virtual void playerEntered(PlayerInfo* player) override;
+            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override;//is used to initialize the player's party and colour
+            virtual bool playerLeft(PlayerInfo* player) override;
+            virtual bool playerChangedName(PlayerInfo* player) override;//unchanged
 
             /*virtual void instructions();
@@ -78,6 +78,6 @@
             void grantPigBoost(SpaceShip* spaceship); // Grant the piggy a boost.
             void resetSpeedFactor(SpaceShip* spaceship);
-            void tick (float dt);// used to end the game
-            SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
+            void tick (float dt) override;// used to end the game
+            SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override;
 
 
Index: /code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h	(revision 10817)
@@ -76,5 +76,5 @@
             void setConfigValues();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             inline const GametypeInfo* getGametypeInfo() const
@@ -175,6 +175,6 @@
             virtual void spawnDeadPlayersIfRequested();
 
-            virtual GSLevelMementoState* exportMementoState();
-            virtual void importMementoState(const std::vector<GSLevelMementoState*>& states);
+            virtual GSLevelMementoState* exportMementoState() override;
+            virtual void importMementoState(const std::vector<GSLevelMementoState*>& states) override;
 
             WeakPtr<GametypeInfo> gtinfo_;
Index: /code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h	(revision 10817)
@@ -61,5 +61,5 @@
             bool bHardPunishment; //!< Switches between damage and death as punishment.
             float punishDamageRate; //!< Makes Damage adjustable.
-            virtual void spawnDeadPlayersIfRequested(); //!< Prevents dead players to respawn.
+            virtual void spawnDeadPlayersIfRequested() override; //!< Prevents dead players to respawn.
             virtual int getMinLives(); //!< Returns minimum of each player's lives; players with 0 lives are skipped; 
 
@@ -69,16 +69,16 @@
             void setConfigValues(); //!< Makes values configurable.
 
-            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //!< If a player shoot's an opponent, his punishment countdown will be resetted.
-            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //!< Manages each players lives.
+            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; //!< If a player shoot's an opponent, his punishment countdown will be resetted.
+            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override; //!< Manages each players lives.
 
-            virtual void end(); //!< Sends an end message.
+            virtual void end() override; //!< Sends an end message.
             int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
             int getNumPlayersAlive() const; //!< Returns the number of players that are still alive.
-            virtual void playerEntered(PlayerInfo* player); //!< Initializes values.
-            virtual bool playerLeft(PlayerInfo* player); //!< Manages all local variables.
-            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn); //!< Resets punishment time and respawn delay.
+            virtual void playerEntered(PlayerInfo* player) override; //!< Initializes values.
+            virtual bool playerLeft(PlayerInfo* player) override; //!< Manages all local variables.
+            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override; //!< Resets punishment time and respawn delay.
 
             void punishPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining".
-            void tick (float dt); //!< used to end the game
+            void tick (float dt) override; //!< used to end the game
     };
 }
Index: /code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h	(revision 10817)
@@ -67,5 +67,5 @@
             std::map<PlayerInfo*, bool> inGame_; //!< Indicates each Player's state.
 
-            virtual void spawnDeadPlayersIfRequested(); //!< Prevents dead players to respawn.
+            virtual void spawnDeadPlayersIfRequested() override; //!< Prevents dead players to respawn.
             virtual int getMinLives(); //!< Returns minimum of each player's lives; players with 0 lives are skipped;
 
@@ -74,12 +74,12 @@
             virtual ~LastTeamStanding(); //!< Default Destructor.
 
-            virtual void playerEntered(PlayerInfo* player); //!< Initializes values.
-            virtual bool playerLeft(PlayerInfo* player); //!< Manages all local variables.
+            virtual void playerEntered(PlayerInfo* player) override; //!< Initializes values.
+            virtual bool playerLeft(PlayerInfo* player) override; //!< Manages all local variables.
 
-            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //!< Manages each player's lost lives.
-            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //!< If a player shoot's an opponent, his punishment countdown will be resetted.
-            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn); //!< Resets punishment time and respawn delay.
-            void tick (float dt); //!< used to end the game
-            virtual void end(); //!< Sends an end message.
+            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override; //!< Manages each player's lost lives.
+            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; //!< If a player shoot's an opponent, his punishment countdown will be resetted.
+            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override; //!< Resets punishment time and respawn delay.
+            void tick (float dt) override; //!< used to end the game
+            virtual void end() override; //!< Sends an end message.
             void punishPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining".
             int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
Index: /code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h	(revision 10817)
@@ -42,10 +42,10 @@
             virtual ~Mission() {}
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void start();
-            virtual void end();
+            virtual void start() override;
+            virtual void end() override;
             virtual void setTeams();
-            virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
             inline void setLives(unsigned int amount)
                 {this->lives_ = amount;}
@@ -58,5 +58,5 @@
 
         protected:
-            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
+            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
             bool missionAccomplished_; //<! indicates if player successfully finsihed the mission;
             int lives_; //<! amount of player's lives <-> nr. of retries
Index: /code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h	(revision 10817)
@@ -44,8 +44,8 @@
             virtual ~TeamBaseMatch() {}
 
-            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
-            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator);
+            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override;
+            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
 
-            virtual void playerScored(PlayerInfo* player, int score = 1);
+            virtual void playerScored(PlayerInfo* player, int score = 1) override;
             virtual void showPoints();
             virtual void endGame();
Index: /code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h	(revision 10817)
@@ -42,12 +42,12 @@
 
             void setConfigValues();
-            virtual void start();
-            virtual void end();
-            virtual void playerEntered(PlayerInfo* player);
-            virtual bool playerLeft(PlayerInfo* player);
-            virtual bool playerChangedName(PlayerInfo* player);
+            virtual void start() override;
+            virtual void end() override;
+            virtual void playerEntered(PlayerInfo* player) override;
+            virtual bool playerLeft(PlayerInfo* player) override;
+            virtual bool playerChangedName(PlayerInfo* player) override;
 
-            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
-            virtual void playerScored(PlayerInfo* player, int score = 1);
+            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
+            virtual void playerScored(PlayerInfo* player, int score = 1) override;
        protected:
             int maxScore_; 
Index: /code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h	(revision 10817)
@@ -46,14 +46,14 @@
             void setConfigValues();
 
-            virtual void playerEntered(PlayerInfo* player);
+            virtual void playerEntered(PlayerInfo* player) override;
             virtual void findAndSetTeam(PlayerInfo* player);
-            virtual bool playerLeft(PlayerInfo* player);
-            virtual void spawnDeadPlayersIfRequested(); //!< Prevents players to respawn.
+            virtual bool playerLeft(PlayerInfo* player) override;
+            virtual void spawnDeadPlayersIfRequested() override; //!< Prevents players to respawn.
 
-            virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr);
-            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr);
-            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
+            virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr) override;
+            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override;
+            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override;
 
-            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
+            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override;
 
 
@@ -67,5 +67,5 @@
 
         protected:
-            virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
+            virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override;
             bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
 
Index: /code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h	(revision 10817)
@@ -43,13 +43,13 @@
 
             void setConfigValues();
-            void tick (float dt);
+            void tick (float dt) override;
             void addDestroyer(Destroyer* destroyer);
             inline Destroyer* getDestroyer() const
                 { return this->destroyer_; }
 
-            virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr);
-            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr);
-            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
-            virtual void playerEntered(PlayerInfo* player);
+            virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr) override;
+            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override;
+            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override;
+            virtual void playerEntered(PlayerInfo* player) override;
 
         protected:
Index: /code/branches/cpp11_v2/src/orxonox/graphics/AnimatedModel.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/AnimatedModel.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/AnimatedModel.h	(revision 10817)
@@ -44,5 +44,5 @@
             virtual ~AnimatedModel();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             void registerVariables();
 
@@ -51,5 +51,5 @@
             virtual void setAnimEnabled(bool enabled);
             virtual void setAnimLoop(bool loop);
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
             virtual void changedMesh();
 
Index: /code/branches/cpp11_v2/src/orxonox/graphics/Backlight.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/Backlight.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/Backlight.h	(revision 10817)
@@ -44,8 +44,8 @@
             virtual ~Backlight();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void tick(float dt);
-            virtual void changedVisibility();
+            virtual void tick(float dt) override;
+            virtual void changedVisibility() override;
 
             inline void setWidth(float width)
@@ -74,15 +74,15 @@
                 { return this->trailmaterial_; }
 
-            virtual void changedScale();
+            virtual void changedScale() override;
 
         protected:
-            virtual void changedTimeFactor(float factor_new, float factor_old);
+            virtual void changedTimeFactor(float factor_new, float factor_old) override;
 
         private:
             void registerVariables();
-            virtual void startturnonoff();
-            virtual void stopturnonoff();
-            virtual void poststopturnonoff();
-            virtual void changedColour();
+            virtual void startturnonoff() override;
+            virtual void stopturnonoff() override;
+            virtual void poststopturnonoff() override;
+            virtual void changedColour() override;
             void update_width();
             void update_lifetime();
Index: /code/branches/cpp11_v2/src/orxonox/graphics/Billboard.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/Billboard.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/Billboard.h	(revision 10817)
@@ -47,7 +47,7 @@
             virtual ~Billboard();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
             inline const BillboardSet& getBillboardSet() const
@@ -71,5 +71,5 @@
 
 
-            virtual void setTeamColour(const ColourValue& colour)
+            virtual void setTeamColour(const ColourValue& colour) override
                 { this->setColour(colour); }
                 
Index: /code/branches/cpp11_v2/src/orxonox/graphics/BlinkingBillboard.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/BlinkingBillboard.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/BlinkingBillboard.h	(revision 10817)
@@ -44,7 +44,7 @@
             virtual ~BlinkingBillboard();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             inline void setAmplitude(float amplitude)
Index: /code/branches/cpp11_v2/src/orxonox/graphics/Camera.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/Camera.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/Camera.h	(revision 10817)
@@ -50,5 +50,5 @@
 
             void setConfigValues();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             void requestFocus();
@@ -72,5 +72,5 @@
             void configvaluecallback_changedNearClipDistance();
 
-            void windowResized(unsigned int newWidth, unsigned int newHeight);
+            void windowResized(unsigned int newWidth, unsigned int newHeight) override;
 
             Ogre::Camera*    camera_;
Index: /code/branches/cpp11_v2/src/orxonox/graphics/FadingBillboard.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/FadingBillboard.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/FadingBillboard.h	(revision 10817)
@@ -45,9 +45,9 @@
             virtual ~FadingBillboard();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void tick(float dt);
-            virtual void changedActivity();
-            virtual void changedVisibility();
+            virtual void tick(float dt) override;
+            virtual void changedActivity() override;
+            virtual void changedVisibility() override;
 
             inline void setTurnOnTime(float turnontime)
@@ -69,5 +69,5 @@
             virtual void stopturnonoff();
             virtual void poststopturnonoff();
-            virtual void changedColour();
+            virtual void changedColour() override;
 
             float turnontime_;
Index: /code/branches/cpp11_v2/src/orxonox/graphics/GlobalShader.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/GlobalShader.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/GlobalShader.h	(revision 10817)
@@ -44,7 +44,7 @@
             virtual ~GlobalShader();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
             inline const Shader& getShader() const
Index: /code/branches/cpp11_v2/src/orxonox/graphics/Light.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/Light.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/Light.h	(revision 10817)
@@ -56,7 +56,7 @@
             virtual ~Light();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
             inline Ogre::Light* getLight()
@@ -78,5 +78,5 @@
                 { return this->specular_; }
 
-            virtual void setTeamColour(const ColourValue& colour)
+            virtual void setTeamColour(const ColourValue& colour) override
                 { this->setDiffuseColour(colour); this->setSpecularColour(colour); }
 
Index: /code/branches/cpp11_v2/src/orxonox/graphics/MeshLodInformation.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/MeshLodInformation.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/MeshLodInformation.h	(revision 10817)
@@ -50,5 +50,5 @@
             float getReductionRate(){ return this->reductionRate_; }
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         private:
Index: /code/branches/cpp11_v2/src/orxonox/graphics/Model.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/Model.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/Model.h	(revision 10817)
@@ -46,7 +46,7 @@
             void setConfigValues();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
             inline const Mesh& getMesh() const
Index: /code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.h	(revision 10817)
@@ -43,8 +43,8 @@
             virtual ~ParticleEmitter();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void changedVisibility();
-            virtual void changedActivity();
+            virtual void changedVisibility() override;
+            virtual void changedActivity() override;
 
             inline ParticleInterface* getParticleInterface() const
Index: /code/branches/cpp11_v2/src/orxonox/graphics/ParticleSpawner.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/graphics/ParticleSpawner.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/graphics/ParticleSpawner.h	(revision 10817)
@@ -43,6 +43,6 @@
             virtual ~ParticleSpawner();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline void stop(bool bDestroy)
Index: /code/branches/cpp11_v2/src/orxonox/infos/Bot.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/infos/Bot.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/infos/Bot.h	(revision 10817)
@@ -45,9 +45,9 @@
             void setConfigValues();
 
-            inline bool isInitialized() const
+            inline bool isInitialized() const override
                 { return true; }
-            inline float getPing() const
+            inline float getPing() const override
                 { return 0; }
-            inline float getPacketLossRatio() const
+            inline float getPacketLossRatio() const override
                 { return 0; }
 
Index: /code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.h	(revision 10817)
@@ -45,11 +45,11 @@
             void setConfigValues();
 
-            bool isInitialized() const;
-            float getPing() const;
-            float getPacketLossRatio() const;
+            bool isInitialized() const override;
+            float getPing() const override;
+            float getPacketLossRatio() const override;
 
             void setClientID(unsigned int clientID);
 
-            virtual void switchGametype(Gametype* gametype);
+            virtual void switchGametype(Gametype* gametype) override;
 
             inline void setHumanHUDTemplate(const std::string& name)
Index: /code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h	(revision 10817)
@@ -44,5 +44,5 @@
             virtual ~PlayerInfo();
 
-            virtual void changedName();
+            virtual void changedName() override;
             virtual void switchGametype(Gametype* gametype);
 
Index: /code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h	(revision 10817)
@@ -77,5 +77,5 @@
             PickupCarrier(); //!< Constructor.
             virtual ~PickupCarrier(); //!< Destructor.
-            void preDestroy(void); //!< Is called before the PickupCarrier is effectively destroyed.
+            void preDestroy(void) override; //!< Is called before the PickupCarrier is effectively destroyed.
 
             bool isTarget(const Pickupable* pickup) const; //!< Can be used to check whether the PickupCarrier or a child of his is a target ot the input Pickupable.
Index: /code/branches/cpp11_v2/src/orxonox/interfaces/Pickupable.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/interfaces/Pickupable.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/interfaces/Pickupable.h	(revision 10817)
@@ -144,5 +144,5 @@
 
         protected:
-            virtual void preDestroy(void); //!< A method that is called by Destroyable::destroy() before the object is actually destroyed.
+            virtual void preDestroy(void) override; //!< A method that is called by Destroyable::destroy() before the object is actually destroyed.
             virtual void destroyPickup(void); //!< Destroys a Pickupable.
             virtual void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.
@@ -182,5 +182,5 @@
         // For implementing the Rewardable interface:
         public:
-            virtual bool reward(PlayerInfo* player); //!< Method to transcribe a Pickupable as a Rewardable to the player.
+            virtual bool reward(PlayerInfo* player) override; //!< Method to transcribe a Pickupable as a Rewardable to the player.
 
     };
Index: /code/branches/cpp11_v2/src/orxonox/items/Engine.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/items/Engine.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/items/Engine.h	(revision 10817)
@@ -59,5 +59,5 @@
             virtual ~Engine();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             void setConfigValues();
 
Index: /code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.h	(revision 10817)
@@ -52,9 +52,9 @@
             virtual ~MultiStateEngine();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void run(float dt);
+            virtual void run(float dt) override;
 
-            virtual void addToSpaceShip(SpaceShip* ship);
+            virtual void addToSpaceShip(SpaceShip* ship) override;
 
             void addEffectContainer(EffectContainer* effect);
Index: /code/branches/cpp11_v2/src/orxonox/items/PartDestructionEvent.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/items/PartDestructionEvent.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/items/PartDestructionEvent.h	(revision 10817)
@@ -100,5 +100,5 @@
             virtual ~PartDestructionEvent();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void execute();
Index: /code/branches/cpp11_v2/src/orxonox/items/ShipPart.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/items/ShipPart.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/items/ShipPart.h	(revision 10817)
@@ -47,5 +47,5 @@
             virtual ~ShipPart();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             virtual void handleHit(float damage, float healthdamage, float shielddamage, Pawn* originator);
Index: /code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h	(revision 10817)
@@ -44,5 +44,5 @@
         ~GUISheet();
 
-        void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void show();
Index: /code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.h	(revision 10817)
@@ -53,6 +53,6 @@
         void setConfigValues();
 
-        void preUpdate(const Clock& time);
-        void postUpdate(const Clock& time) { /*no action*/ }
+        void preUpdate(const Clock& time) override;
+        void postUpdate(const Clock& time) override { /*no action*/ }
 
         static void openConsole();
@@ -65,10 +65,10 @@
         void deactivate();
 
-        void linesChanged();
-        void lineAdded();
-        void inputChanged();
-        void cursorChanged();
-        void executed();
-        void exit();
+        void linesChanged() override;
+        void lineAdded() override;
+        void inputChanged() override;
+        void cursorChanged() override;
+        void executed() override;
+        void exit() override;
 
         void shiftLines();
@@ -77,5 +77,5 @@
         void print(const std::string& text, Shell::LineType type, int index, bool alwaysShift = false);
 
-        void windowResized(unsigned int newWidth, unsigned int newHeight);
+        void windowResized(unsigned int newWidth, unsigned int newHeight) override;
 
         // config value related
Index: /code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h	(revision 10817)
@@ -90,7 +90,7 @@
         virtual ~OrxonoxOverlay();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
-        virtual void changedName();
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+
+        virtual void changedName() override;
 
         //! Shows the overlay with an detour to BaseObject::visibility_
@@ -167,5 +167,5 @@
         void setBackgroundColour(ColourValue colour);
 
-        virtual void changedVisibility();
+        virtual void changedVisibility() override;
 
         inline void setOwner(BaseObject* owner)
@@ -206,5 +206,5 @@
 
     private:
-        void windowResized(unsigned int newWidth, unsigned int newHeight);
+        void windowResized(unsigned int newWidth, unsigned int newHeight) override;
 
         static unsigned int hudOverlayCounter_s;   //!< Static counter for hud elements
Index: /code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.h	(revision 10817)
@@ -58,5 +58,5 @@
         ~OverlayGroup();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         static void toggleVisibility(const std::string& name);
@@ -68,5 +68,5 @@
             { return this->hudElements_; }
 
-        virtual void changedVisibility();
+        virtual void changedVisibility() override;
 
         void setOwner(BaseObject* owner);
Index: /code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h	(revision 10817)
@@ -50,7 +50,7 @@
         AmbientSound();
 
-        void play();
-        bool stop();
-        void pause();
+        void play() override;
+        bool stop() override;
+        void pause() override;
 
         bool setAmbientSource(const std::string& source);
@@ -66,7 +66,7 @@
 
     private:
-        void preDestroy();
-        float getRealVolume();
-        bool moodChanged(const std::string& mood);
+        void preDestroy() override;
+        float getRealVolume() override;
+        bool moodChanged(const std::string& mood) override;
         inline void ambientSourceChanged()
             { this->setAmbientSource(this->ambientSource_); }
Index: /code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h	(revision 10817)
@@ -68,6 +68,6 @@
         ~SoundManager();
 
-        void preUpdate(const Clock& time);
-        void postUpdate(const Clock& time) { /*no action*/ }
+        void preUpdate(const Clock& time) override;
+        void postUpdate(const Clock& time) override { /*no action*/ }
         void setConfigValues();
 
Index: /code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h	(revision 10817)
@@ -50,8 +50,8 @@
             virtual ~WorldAmbientSound();
 
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void changedActivity();
+            virtual void changedActivity() override;
 
             void play();
Index: /code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h	(revision 10817)
@@ -47,9 +47,9 @@
         WorldSound(Context* context);
 
-        void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-        void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
-        void changedActivity();
+        void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+        void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
+        void changedActivity() override;
 
-        void tick(float dt);
+        void tick(float dt) override;
 
     protected:
@@ -58,6 +58,6 @@
     private:
         void registerVariables();
-        void initialiseSource();
-        float getRealVolume();
+        void initialiseSource() override;
+        float getRealVolume() override;
     };
 }
Index: /code/branches/cpp11_v2/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h	(revision 10817)
@@ -42,5 +42,5 @@
             virtual ~DefaultWeaponmodeLink();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline void setFiremode(const unsigned int firemode)
Index: /code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.h	(revision 10817)
@@ -50,5 +50,5 @@
             virtual ~Weapon();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void fire(unsigned int mode);
Index: /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.h	(revision 10817)
@@ -51,5 +51,5 @@
             virtual ~WeaponMode();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             bool fire(float* reloadTime);
Index: /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.h	(revision 10817)
@@ -44,5 +44,5 @@
             virtual ~WeaponPack();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void fire(unsigned int weaponmode);
Index: /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.h	(revision 10817)
@@ -44,5 +44,5 @@
             virtual ~WeaponSet();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void fire();
Index: /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h	(revision 10817)
@@ -62,5 +62,5 @@
             virtual ~WeaponSlot();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void attachWeapon(Weapon * weapon);
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/CameraPosition.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/CameraPosition.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/CameraPosition.h	(revision 10817)
@@ -41,5 +41,5 @@
             virtual ~CameraPosition();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline void setDrag(bool bDrag)
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h	(revision 10817)
@@ -54,6 +54,6 @@
             virtual ~ControllableEntity();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
             void setConfigValues();
 
@@ -141,8 +141,8 @@
             using MobileEntity::setAngularVelocity;
 
-            void setPosition(const Vector3& position);
-            void setOrientation(const Quaternion& orientation);
-            void setVelocity(const Vector3& velocity);
-            void setAngularVelocity(const Vector3& velocity);
+            void setPosition(const Vector3& position) override;
+            void setOrientation(const Quaternion& orientation) override;
+            void setVelocity(const Vector3& velocity) override;
+            void setAngularVelocity(const Vector3& velocity) override;
 
             inline bool hasLocalController() const
@@ -177,5 +177,5 @@
 
         protected:
-            virtual void preDestroy();
+            virtual void preDestroy() override;
 
             virtual void setPlayer(PlayerInfo* player); // don't call this directly, use friend class PlayerInfo instead
@@ -184,5 +184,5 @@
             virtual void startLocalHumanControl();
             virtual void stopLocalHumanControl();
-            virtual void parentChanged();
+            virtual void parentChanged() override;
 
             inline void setHudTemplate(const std::string& name)
@@ -214,5 +214,5 @@
 
             // Bullet btMotionState related
-            void setWorldTransform(const btTransform& worldTrans);
+            void setWorldTransform(const btTransform& worldTrans) override;
 
             unsigned int server_overwrite_;
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/Drone.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/Drone.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/Drone.h	(revision 10817)
@@ -50,15 +50,15 @@
             virtual ~Drone();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Drone through XML.
-            virtual void tick(float dt); //!< Defines which actions the Drone has to take in each tick.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a Drone through XML.
+            virtual void tick(float dt) override; //!< Defines which actions the Drone has to take in each tick.
 
 
-            virtual void moveFrontBack(const Vector2& value);
-            virtual void moveRightLeft(const Vector2& value);
-            virtual void moveUpDown(const Vector2& value);
+            virtual void moveFrontBack(const Vector2& value) override;
+            virtual void moveRightLeft(const Vector2& value) override;
+            virtual void moveUpDown(const Vector2& value) override;
 
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
 
             /**
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/EffectContainer.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/EffectContainer.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/EffectContainer.h	(revision 10817)
@@ -43,5 +43,5 @@
             virtual ~EffectContainer();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void setLuaState(LuaState* state, const std::string& functionName);
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.h	(revision 10817)
@@ -43,5 +43,5 @@
             virtual ~ExplosionChunk();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             inline void setLOD(LODParticle::Value level)
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h	(revision 10817)
@@ -55,14 +55,14 @@
             virtual ~MobileEntity();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
 
-            virtual void setPosition(const Vector3& position);
-            virtual void setOrientation(const Quaternion& orientation);
+            virtual void setPosition(const Vector3& position) override;
+            virtual void setOrientation(const Quaternion& orientation) override;
 
             virtual void setVelocity(const Vector3& velocity);
             inline void setVelocity(float x, float y, float z)
                 { this->setVelocity(Vector3(x, y, z)); }
-            inline const Vector3& getVelocity() const
+            inline const Vector3& getVelocity() const override
                 { return this->linearVelocity_; }
             /**
@@ -108,6 +108,6 @@
         protected:
             // Bullet btMotionState related
-            virtual void setWorldTransform(const btTransform& worldTrans);
-            void getWorldTransform(btTransform& worldTrans) const;
+            virtual void setWorldTransform(const btTransform& worldTrans) override;
+            void getWorldTransform(btTransform& worldTrans) const override;
 
             Vector3 linearAcceleration_;
@@ -117,5 +117,5 @@
 
         private:
-            virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
+            virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const override;
     };
 }
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h	(revision 10817)
@@ -46,13 +46,13 @@
             virtual ~MovableEntity();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
 
             using WorldEntity::setPosition;
             using WorldEntity::setOrientation;
 
-            inline void setPosition(const Vector3& position)
+            inline void setPosition(const Vector3& position) override
                 { MobileEntity::setPosition(position); this->overwrite_position_ = this->getPosition(); }
-            inline void setOrientation(const Quaternion& orientation)
+            inline void setOrientation(const Quaternion& orientation) override
                 { MobileEntity::setOrientation(orientation); this->overwrite_orientation_ = this->getOrientation(); }
 
@@ -79,6 +79,6 @@
         private:
             void registerVariables();
-            void clientConnected(unsigned int clientID);
-            void clientDisconnected(unsigned int clientID);
+            void clientConnected(unsigned int clientID) override;
+            void clientDisconnected(unsigned int clientID) override;
             void resynchronize();
 
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.h	(revision 10817)
@@ -44,5 +44,5 @@
             virtual ~SpawnPoint() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline void setSpawnClass(Identifier* identifier)
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h	(revision 10817)
@@ -55,10 +55,10 @@
             using WorldEntity::setOrientation;
 
-            void setPosition(const Vector3& position);
-            void setOrientation(const Quaternion& orientation);
+            void setPosition(const Vector3& position) override;
+            void setOrientation(const Quaternion& orientation) override;
 
         private:
             void registerVariables();
-            bool isCollisionTypeLegal(CollisionType type) const;
+            bool isCollisionTypeLegal(CollisionType type) const override;
 
             // network callbacks
@@ -69,6 +69,6 @@
 
             // Bullet btMotionState related
-            void setWorldTransform(const btTransform& worldTrans);
-            void getWorldTransform(btTransform& worldTrans) const;
+            void setWorldTransform(const btTransform& worldTrans) override;
+            void getWorldTransform(btTransform& worldTrans) const override;
     };
 }
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/TeamSpawnPoint.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/TeamSpawnPoint.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/TeamSpawnPoint.h	(revision 10817)
@@ -43,5 +43,5 @@
             virtual ~TeamSpawnPoint() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void setTeamNumber(unsigned int team)
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.h	(revision 10817)
@@ -96,5 +96,5 @@
             virtual ~WorldEntity();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline const Ogre::SceneNode* getNode() const
@@ -108,6 +108,6 @@
             static const Vector3 UP;
 
-            virtual void changedActivity(void);
-            virtual void changedVisibility(void);
+            virtual void changedActivity(void) override;
+            virtual void changedVisibility(void) override;
 
             virtual void setPosition(const Vector3& position) = 0;
Index: /code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- /code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h	(revision 10816)
+++ /code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h	(revision 10817)
@@ -61,6 +61,6 @@
             virtual ~Pawn();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
 
             inline bool isAlive() const
@@ -143,6 +143,6 @@
             virtual void kill();
 
-            virtual void fired(unsigned int firemode);
-            virtual void reload();
+            virtual void fired(unsigned int firemode) override;
+            virtual void reload() override;
             virtual void postSpawn();
 
@@ -179,5 +179,5 @@
 
 
-            virtual void startLocalHumanControl();
+            virtual void startLocalHumanControl() override;
 
             void setAimPosition( Vector3 position )
@@ -186,8 +186,8 @@
                 { return this->aimPosition_; }
 
-            virtual const Vector3& getCarrierPosition(void) const
+            virtual const Vector3& getCarrierPosition(void) const override
                 { return this->getWorldPosition(); };
 
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
             void setExplosionSound(const std::string& engineSound);
@@ -195,8 +195,8 @@
 
         protected:
-            virtual void preDestroy();
-
-            virtual void setPlayer(PlayerInfo* player);
-            virtual void removePlayer();
+            virtual void preDestroy() override;
+
+            virtual void setPlayer(PlayerInfo* player) override;
+            virtual void removePlayer() override;
 
             virtual void death();
@@ -212,7 +212,7 @@
             bool bAlive_;
 
-            virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const
+            virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const override
                 { return new std::vector<PickupCarrier*>(); }
-            virtual PickupCarrier* getCarrierParent(void) const
+            virtual PickupCarrier* getCarrierParent(void) const override
                 { return nullptr; }
 
