Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
Job #19766 BUG: Stop or reload all scripts crashes interface fixed.

QUrl(name).toString() does not equal name, therefore removing name from
ScriptEngineHash was failing, and a dangling pointer was left in the
script engine hash map.
Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2.

Keep the scriptUrl internal to the ScriptEngine class and refer to it
externally by the file name string.

Change the ScriptEngine constructor to accept a filename QString,
instead of a QUrl. Resolve constructor ambiguity in Particle, which
creates anonymous ScriptEngine.
VoxelPacketProcessor -> OctreePacketProcessor

added nodes bookkeeping in ReceivedPacketProcessor; added check in
sendNack() to not send NACKs to nodes that have sent packets that are
waiting in the message queue.
added default constructor for NetworkPacket

updated param comments in ReceivedPacketProcessor
Add menu item that toggles VR display mode

Toggles the display mode if a Rift is found connected at program start.
moved sendNack() into packetDistributor()

...for the purpose of enforcing packets sent per interval in
OctreeSendThread.  Corrected mistake in keeping track of number of
special packets sent where sendSpecialPacket() was assumed to only send
one packet per call.
changed NetworkPacket::_sendingNode to ::_node
Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2."

This reverts commit b4e984086505814cbc426226777b74a113da8362.
Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3

Move the conversion of scriptName to QUrl to the beginning of
Application::loadScript. Use the scriptURLString to query the
_scriptEngineHash map.
Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3"

This reverts commit 46f2ab73bccf6fa8669856534f0c20f96ee8c416.
Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3

Same comments as before, but without the local files changes mistakenly
checked in.
Merge remote-tracking branch 'upstream/master'
added killNode() slot for _packetCounts garbage collection
Merge pull request #3010 from wangyix/master

NACK packets are not sent to nodes with unprocessed packets; re-sent packets will be counted towards PPS
killNode() to nodeKilled()
Merge pull request #3011 from Barnold1953/OculusOverlay

growTrees.js