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
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
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
Add Node border display
Merge branch '19630' of github.com:huffman/hifi into 19630

Conflicts:
	interface/src/Menu.h
Working on joystick support using SDL.
Avoid unused variable warnings in Xcode.
First cut at adding external joysticks to the mix.
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
Fixed index of out bounds error, issue with head not being tracked in
PrioVR.
Basic joystick integration.
Merge branch 'master' of https://github.com/worklist/hifi
MenuOption::Visage now default to false.
changed
    float specular = max(0.0, dot(normalize(gl_LightSource[0].position + vec4(0.0, 0.0, 1.0, 0.0)), normalizedNormal));
to
    float specular = max(0.0, dot(gl_LightSource[0].position, normalizedNormal));

Calculation for specular value has to be done like in all other shaders with the unmodified unnormalized lightsource position. Otherwise the specular effect will have weird behaviour.