Fix components
Merge branch 'master' of https://github.com/stevenremot/tlsd-prototype

Conflicts:
	src/Geometry/PositionComponent.cpp
	src/Geometry/PositionComponent.h
	src/Physics/MovementComponent.cpp
	src/Physics/MovementComponent.h