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
Script to make your avatar sit down.
send an updated address to data-server with domain (when changed)
more correct model bounding capsule
merge upstream/master into andrew/inertia

Conflicts:
	interface/src/renderer/Model.cpp
formatting some lines that are too long
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
Rotation bits for alternate IK.