switched edit nacks to non-verified
Merge remote-tracking branch 'origin/master'

Conflicts:
	assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
Merge remote-tracking branch 'upstream/master'
Fix fullscreen toggle shortcut

Remove the "Meta" modifier so that the shortcut works on Windows.
added InterframeTimeGapHistory and frameReceived() calls
added debug code for testing time gap history
removed debug code
fixed a for loop that erased elements while iterating
moved time gap history to PositionalAudioRingBuffer, untested

removed hard-coded jitter buffer length.
Different fullscreen shortcuts for Mac and Windows

Revert to the original Mac OSX key combination and provide alternative for Windows.
fixed bug in Audio.cpp where numSilentSamples was written to wrong place in packet

added more debug stuff, other minor changes and fixes
completed code for dynamicly resizing jitter buffer
fixed minor comment typo
fixed typo with frames/samples confusion.
added debug prints to look at injected ring buffers
removed debug code
changed InterframeTimeGapHistory to InterframeTimeGapStats
Merge pull request #3050 from ctrlaltdavid/fix_fullscreen_shortcut

Fix fullscreen toggle shortcut
fixed spacing issue
Merge pull request #3055 from wangyix/master

Audio jitter buffer resizes depending on max inter-frame time gaps of incoming audio packets