fixed third person shift bug
Merge remote-tracking branch 'upstream/master'
merge
Merge pull request #442 from Ventrella/master

camera bug