Merge remote-tracking branch 'origin/LOLTESTING' into AnimationFixing

Conflicts:
	src/Gameplay/movement_system.cpp
	src/Input/keyinputsystem.cpp
	src/main.cpp
Merged with LOLTESTING again.
Merged with LOLTESTING
Merged from LOLTESTING
Merge remote-tracking branch 'origin/LOLTESTING' into AnimationFixing

Conflicts:
	Makefile
	assets/Graphics/map/map_01/map01.txt
	src/Graphics/animation_system.cpp
	src/Graphics/map.cpp
	src/Input/keyinputsystem.cpp
	src/Network/ClientUpdateSystem.cpp
	src/Network/Packets.h
	src/components.h
	src/main.cpp
	src/triggered.cpp
	src/world.cpp
	src/world.h
Comments
LOL