Added changes/fixes for Linux, possibly broke for Macs.
Merge branch 'dev-pm14' into dev

Conflicts:
	source/game/camera.cpp