Merge pull request #818 from Atlante45/master

Colliding fixes
OpenGL fields of view are vertical, not horizontal.
Merge branch 'master' of https://github.com/worklist/hifi

Conflicts:
	interface/src/Camera.cpp
Merge pull request #819 from ey6es/master

Terminology fix: OpenGL fields of view are vertical, not horizontal.
Merge branch 'master' of https://github.com/worklist/hifi