Changes to CameraHandler.
Merge branch 'master' of https://github.com/hal7df/further-suggestions

Conflicts:
	further-suggestions/further-suggestions.cpp