fixed merge problem with shifted avatar
Merge pull request #57 from ZappoMan/view_frustum_work

fixed merge problem with shifted avatar