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
Working on alternate IK mode.
Merge branch 'master' of https://github.com/worklist/hifi
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.
Script to make your avatar sit down.
Try smoothing the PrioVR input over a couple of frames.
Fixed compile error.
send an updated address to data-server with domain (when changed)
Merge pull request #2860 from ey6es/priority

PrioVR tweaks: average over two frames, use Faceshift head rotation when PrioVR one is unavailable.
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge pull request #2861 from birarda/master

send an updated address to data-server with domain (when changed)
Add Node border display
Merge branch '19630' of github.com:huffman/hifi into 19630

Conflicts:
	interface/src/Menu.h