Merge branch 'master' of https://github.com/highfidelity/hifi
Hack for the Viking Palace scene before demo for good looking lightmaps
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
Fix constant movement with hydra by adding null zone for thrust
add same for rotation
...and don't turn on/off UI from hydra
Merge pull request #3887 from samcake/tot

Hack for the Viking Palace scene before demo for good looking lightmaps
Merge pull request #3888 from PhilipRosedale/master

Bug Fix: Hydra controllers sometimes moving constantly with hydraMove.js
Merge branch 'master' of https://github.com/highfidelity/hifi
fix for delayed heartbeats, late socket lookup
Merge pull request #3891 from birarda/master

fix for delayed domain-server heartbeats
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork