mouse move
logging
Merge branch 'master' of github.com:joeferner/camera-multitouch

Conflicts:
	input_osx.cpp