Merge remote-tracking branch 'origin/Movement'

Conflicts:
	Fade2D/Entity.cpp
	Fade2D/Fade2D.cpp
	Fade2D/Fade2D.h
	Fade2D/ShaderHandler.cpp
	Fade2D/ShaderHandler.h
	Fade2D/internal.h
	FadeTest/main.cpp