simplified frustum camera mode, fixed resizeGL in case of frustum being on
Merge branch 'master' of https://github.com/worklist/hifi

Conflicts:
	interface/src/Application.cpp
	interface/src/Camera.cpp
cleanup resizeGL, and Display Frustum menus
CR feedback
Merge pull request #823 from ZappoMan/master

Display Frustum and resizeGL() cleanup
Fix other avatar not rendered in first person
socket changes to send correct port to pairing server
Merge pull request #825 from Atlante45/master

Fix other avatar not rendered in first person
Merge pull request #826 from birarda/master

socket changes to send proper port to pairing server
Merge branch 'master' of git://github.com/worklist/hifi into dev4