Merge remote-tracking branch 'origin/tear' into thomas

Conflicts:
	Debug/src/AnimatedSprite.o
	Debug/src/Animation.o
	Debug/src/LayoutGen.o
	Debug/src/Unit.o
	Debug/src/ZeroGameEngine.o
	Debug/src/main.o
	include/Character.hpp
	include/Hero.hpp
	include/ZeroGameEngine.hpp
	src/Unit.cpp
	src/ZeroGameEngine.cpp