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
require a distinction between master config and user config
add locked settings to json return for auth'ed settings
disable form inputs for values set by master config
add a tooltip to say why locked settings cannot be changed
fix for settings save without organization
use two dashes for url as command line option
Merge branch 'master' of https://github.com/worklist/hifi
frame interpolation for recordings
dynamically load sixense lib on OS X to make avoiding hid_init crash easier
make the sixense library name a constant
wrap sixenseExit call in HAVE_SIXENSE ifdef
handle avatar location changes after avatar position has been reloaded
move url handling to after settings load debug
Members initialisation
remove definition for an unused method
Merge pull request #3506 from ey6es/master

Fix for metavoxel crashes on Windows.  I was expecting the scope of a
Merge pull request #3503 from birarda/domain-wizard

lock changes to settings in the domain-server master config file