Maps
Merge branch 'master' into Laury

Conflicts:
	lib/include/Utility/Tools.hpp
	template/include/Game/BaseComponent.hpp
	template/main.cpp
	third-party/tinyxml2/dox
	third-party/tinyxml2/include/tinyxml2/tinyxml2.cpp
	third-party/tinyxml2/include/tinyxml2/tinyxml2.h
	third-party/tinyxml2/resources/dream.xml
	third-party/tinyxml2/resources/utf8test.xml
	third-party/tinyxml2/resources/utf8testverify.xml
	third-party/tinyxml2/setversion.py
	third-party/tinyxml2/tinyxml2.cpp
	third-party/tinyxml2/tinyxml2.h
	third-party/tinyxml2/tinyxml2/tinyxml2.sln
	third-party/tinyxml2/tinyxml2/tinyxml2.vcxproj
	third-party/tinyxml2/tinyxml2/tinyxml2.vcxproj.filters
GameManager
correction du header pour matcher la nouvelle définition d'André
GameManager opérationel avec main adapté ! servez vous (pour lancer la phase de jeu, appuyez sur la barre d'espace après le 1er ecran noir, pour quitter appuyez sur echap)
Création AABB3D.hpp
Merge branch 'Nicolas' of https://github.com/IMACoconut/ImaKart.git into Laury
Menu in-game.
Kart bouge
Merge branch 'master' into Laury

Conflicts:
	lib/include/Graphics/Scene/Scene.hpp
	lib/src/Graphics/Render/RenderMethod.cpp
	template/main.cpp
Test GameMap 2
Merge branch 'master' of https://github.com/IMACoconut/ImaKart.git into Laury
Chargement map 2
Merge branch 'master' of https://github.com/IMACoconut/ImaKart.git into Laury
Merge branch 'Monia' of https://github.com/IMACoconut/ImaKart.git into Laury
Utilisation des game states
Deferred rendering corrected
Added ia::Behavior empty class
Some game logic added
Merge branch 'Laury' of https://github.com/IMACoconut/ImaKart.git into Andre

Conflicts:
	form-builder
	lib/include/Utility/Tools.hpp
	template/game.cpp
	template/include/Game/kart.hpp
	template/src/Game/kart.cpp
Integration of Laury, Nicolas and Monia's code.
Preparing new Entity/Component version