Merge branches 'camera' and 'master' of github.com:Marcon/pt into camera
disallow diagonal moving