Merge branch 'master' of https://github.com/highfidelity/hifi
Switched to Halo gun in gun.js, work in progress on hydraMove to add flying
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Fix interface log file location

Put in \High Fidelity\Interface\Logs rather than \interface\Logs.
Working on alternate IK mode.
fixing models not rendering sometimes
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
cleanup debug
Merge pull request #2857 from ctrlaltdavid/interface_log_dir

Fix interface log file location
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #2858 from ZappoMan/modelserver

Fix bug where sometimes models don't render
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
More work on integrating IK solution from Sixense.
Merge branch 'master' of https://github.com/highfidelity/hifi
When PrioVR is connected but head rotation is unavailable, use Faceshift
rotation.
Try smoothing the PrioVR input over a couple of frames.
Fixed compile error.
send an updated address to data-server with domain (when changed)