Merge branch 'master' of https://github.com/worklist/hifi
your agents are now nodes
resolve conflicts on merge with upstream master
agentData to nodeData in voxel-server
Merge pull request #616 from birarda/node

your agents are now nodes
Merge branch 'master' of https://github.com/worklist/hifi
Use 15 blinks per minute as a base/maximum frequency.
Merge pull request #624 from ey6es/master

Per Ryan's request, use 15 blinks per minute as a baseline/maximum frequency.
Merge branch 'master' of https://github.com/worklist/hifi into dev4