Camera controller and AABB.
Merge branch 'master' of github.com:paanil/jkhmip

Conflicts:
	src/CameraController.cpp
	src/CameraController.h
	src/Math/AABB.cpp
	src/Math/AABB.h