perspective camera
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GameManager.cpp
	src/PerspectiveCamera.cpp
	src/PerspectiveCamera.h