fixed problem of camera shifting when application starts (made camera jump to ideal position/rotation when initialized)
Merge remote-tracking branch 'upstream/master'
fixed merge conflict