Camera and keyboard/mouse input.
Merge remote-tracking branch 'origin/master'