basic version
Merge branch 'master' of https://github.com/jdubeau123/physicaltherapy

Conflicts:
	game_team/Game/Game/source/core/World.cpp
	game_team/Game/Game/source/manager/CameraManager.cpp