Shorten some long lines
Continue CollisionEngine implementation
Merge branch 'application-base' of https://github.com/stevenremot/tlsd-prototype into application-base
Add MovementTimer object
First working collisions
Merge branch 'application-base' of https://github.com/stevenremot/tlsd-prototype into application-base

Conflicts:
	src/World/EntityCreator.cpp