Merge branch 'master' into cxx17

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/EC/Manager.hpp
index 3ae090c4f9c03d4c505b2bf8d6386a705e8726d6,1160759078c1e26477b3b9888da98cf450da5bb3..22d757f8c700ab9b764427bd9329f28e43890454
--- 1/src/EC/Manager.hpp
--- 2/src/EC/Manager.hpp
+++ b/src/EC/Manager.hpp
@@@ -33,8 -33,11 +33,10 @@@
  #include "Meta/Matching.hpp"
  #include "Meta/ForEachWithIndex.hpp"
  #include "Meta/ForEachDoubleTuple.hpp"
 -#include "Meta/IndexOf.hpp"
  #include "Bitset.hpp"
  
+ #include "ThreadPool.hpp"
+ 
  namespace EC
  {
      /*!
@@@ -451,28 -473,22 +464,28 @@@
              {
                  return;
              }
 -
 -            std::get<BitsetType>(
 -                entities[entityID]
 -            ).template getTagBit<Tag>() = true;
 +            else
 +            {
 +                if(!isAlive(entityID))
 +                {
 +                    return;
 +                }
 +                std::get<BitsetType>(
 +                    entities[entityID]
 +                ).template getTagBit<Tag>() = true;
 +            }
          }
  
-     /*!
-         \brief Removes the given Tag from the given Entity.
+         /*!
+             \brief Removes the given Tag from the given Entity.
  
-         If the Entity does not have the Tag given, nothing will change.
+             If the Entity does not have the Tag given, nothing will change.
  
-         Example:
-         \code{.cpp}
-             manager.removeTag<T0>(entityID);
-         \endcode
-     */
+             Example:
+             \code{.cpp}
+                 manager.removeTag<T0>(entityID);
+             \endcode
+         */
          template <typename Tag>
          void removeTag(const std::size_t& entityID)
          {