fixed camera bug, added zoom controls
Merge remote-tracking branch 'origin/master'
fixed camera bug, added zoom controls