Tweaked some values for camera scrolling
Merge branch 'origin/master'